Fixed adding port to host if the host already contains it.