Fix fight propagation