Large bug fix around the fight