Fixed database 2