Fix for new schema.