The change I made is the simplest possible one, where I clone everything.