Add missing deep copy before the remapping