D2X also needs the workaround for do_weapon_select