CombatBug Fixed