Fixed schema bug