datamodel fix