Fix problem with undef override_hostname