Fixed bug in schema