fix_for_bb