C++ fix.