change for c++ compatability