Fix to be C++ correct