Fixed datamodel glitch