Fixing system_database