C++ friendliness fix