Do we know what was the problem with the C++ version in the first place ? Why not keep it as is ?