Fix currentWeapon