Fixed support for C++