A bug fix in the database handler