Fixed the C++ API, finally ( for now )