Fixed C++ serialization.