Bug Fix in DB Tool