fix C++ namespace issue