Fixed bug with copy/paste