Fix yank

Fixes issues raised in #19