Tested OK on IPv6, fixes #1