Fix to last-gen collection (which also fixed C++ by coincidence)