Fix issue with fight