Fix copy (along with tests)