Improved handling of copy handlers