Fix C++ string passing