Quick fix for #119,  copy_ goes into infinite loop

This needs a little more review,  and a regression test.