Fix for DB