C++ fix