fixed C++ client