Yeah the problem with this code is it is used both by DNS and DHCP. I guess we can live with this.

Going to test now, thanks.