Added: Fix for DB