Fix issue with getting MACAddress