Added fix for whitelisted servers.