Fix for C++.