Fix hostnames issue