Ipv6 support 2nd attempt