To fix FM-1040, we came up with a solution as depicted by SVN change number 17636. However we are not totally satisfied because some multicast specific code was introduced to the NetLoader class. To remedy the problem, we introducted an indirection such that the multicast specific code goes to the MulticastNetLoader.