Fixed cut/paste bug