Add workaround for DNS garbage return