fixed host name handling