Fix bb_handler