Fixed problem with schema