Fix mac_data generation