minimal change in C++ code