Fixing a schema issue