The database has been fixed according to the conventions #149