quick-fix related to c++ client compatibility