fix for opt-in `Copy`
Merge pull request #251 from HeroesGrave/master

Fixes for opt-in `Copy`