Fixed C++ incompatibility