Fix for IPv6