Temporary runtime fix for C++