bug 1183: correct comments from cut/paste