Fixing problem with DB