Fix a C++ issue