Fixed hostname redundancy issue