Make remap non-destructive