Fix cut-n-paste-o