Fix Whois Issue