Fix for new database "schema"