Schemacheck error fixed.
Merge branch 'schemacheck'