Old c++ fix