Fixed schema problem