Fixed hostname logic...