C++ fix: use custom string class