Incopatible protocol fix! Include message type code under MAC tag to prevent