Multiple host names fix