Improve the no-yanking paste