Fix the schema