Fix with new database