Fixed fix for C++ that didn't work