Fix c++