Fixed fight bug