Fix for new schema