Issue #662 fixed - Companion copy/paste bug