Fix where is was adding the host twice in certain scenarios