IPv6 related fix