Fix issue with HostNames