Second fix to get_host