Fixed C++ 'Structure' consistency