fix in C++ mode