fix cpp+mm