fixing the DB issue