Fix for DHCP with Metadata