fixed issue on dynamic instances
3 files changed