C++ pr12 fix 2