Lot of fix around the fight