fix datamodel event