fixed issue with DB