Potential work around for hostname issues