Attempting to fix CXX