More likely fixed host names properly