Fix bug in the schema and the drawer.