Fix - do not escape macaddress