kaos42 fixed bug in CppM and CppM2