Fixed the combat glitch