dbhandler fix
merged