-FIx a dumb little duplication bug (passing references of the same stuff
around, cloning instead)