Re #6287  Bug fix old style C++