Temp fix for database