Fix fight bug