fixed C++ utils