c++ build fix 2