DatabaseManager fix