Fixed getting the MACs from the record
Merge origin/master