diff --git a/example/cmd/_test/elvish.elv b/example/cmd/_test/elvish.elv
index 0c54237e..0e73651b 100644
--- a/example/cmd/_test/elvish.elv
+++ b/example/cmd/_test/elvish.elv
@@ -6,7 +6,7 @@ set edit:completion:arg-completer[example] = {|@arg|
 		if (not-eq $completion[Usage] "") {
 			edit:notify (styled "usage: " $completion[DescriptionStyle])$completion[Usage]
 		}
-		put $completion[Candidates] | all (one) | each {|c|
+		put $completion[Candidates] | all (one) | peach {|c|
 			if (eq $c[Description] "") {
 		    	edit:complex-candidate $c[Value] &display=(styled $c[Display] $c[Style]) &code-suffix=$c[CodeSuffix]
 			} else {
diff --git a/internal/shell/elvish/snippet.go b/internal/shell/elvish/snippet.go
index 9c5a8b6d..a06f3380 100644
--- a/internal/shell/elvish/snippet.go
+++ b/internal/shell/elvish/snippet.go
@@ -18,7 +18,7 @@ func Snippet(cmd *cobra.Command) string {
 		if (not-eq $completion[Usage] "") {
 			edit:notify (styled "usage: " $completion[DescriptionStyle])$completion[Usage]
 		}
-		put $completion[Candidates] | all (one) | each {|c|
+		put $completion[Candidates] | all (one) | peach {|c|
 			if (eq $c[Description] "") {
 		    	edit:complex-candidate $c[Value] &display=(styled $c[Display] $c[Style]) &code-suffix=$c[CodeSuffix]
 			} else {