Fix fight logic