Rearrange in the schema file a bit..