Fixing yank problem