Fixed MAC problems