Fixed copying even better