Experimental IPv6 fix