Hack for ipv6 TODO FIX this