fix bug introduced in datamodel overhaul