issue#1232 - Copy fix for preventing double copy