Fixed issue where 'change' event is being fired before the isNotDirty
property is updated