Fix for double hostname assignment