Fix weaponorder