...and fix the C++ issue not only for standalone