Added cppclass/struct fix