Fixed bug with combat.