Bug fix in DBHandler