Fix to schema