Another version-specific data model fix