Fix bug on create/update 'dirty fields'