fixing yankstack + surround clobbering