fixed fighting bug