FIX DB BUG