C++ ISO standard fix