fixed db_handler