7.4 - fixed fighting