Ed: fix a merge error of PR 471