fix for yank-pop