Fix issue with missing mac addresses