Multicast fix