Fix to IPv6 handling