Fixed yet another combat bug