CMAC multihop bug fix