Fixed bug with combat