Fix: Better check for IPV6