Fixed for C++.