Fixing the c++ standard