dnsandhostname rebase fix