diff --git a/shell/completion.zsh b/shell/completion.zsh
index 2444cbd..b6aec33 100644
--- a/shell/completion.zsh
+++ b/shell/completion.zsh
@@ -112,7 +112,7 @@ _fzf_complete() {
   local args rest str_arg i sep
   args=("$@")
   sep=
-  for i in {0..$#args}; do
+  for i in {0..${#args[@]}}; do
     if [[ "${args[$i]}" = -- ]]; then
       sep=$i
       break
diff --git a/test/test_go.rb b/test/test_go.rb
index ca862a5..765108c 100755
--- a/test/test_go.rb
+++ b/test/test_go.rb
@@ -2176,7 +2176,7 @@ unset <%= UNSETS.join(' ') %>
 
 # Old API
 _fzf_complete_f() {
-  _fzf_complete "--multi --prompt \"prompt-f> \"" "$@" < <(
+  _fzf_complete "+m --multi --prompt \"prompt-f> \"" "$@" < <(
     echo foo
     echo bar
   )
@@ -2184,7 +2184,7 @@ _fzf_complete_f() {
 
 # New API
 _fzf_complete_g() {
-  _fzf_complete --multi --prompt "prompt-g> " -- "$@" < <(
+  _fzf_complete +m --multi --prompt "prompt-g> " -- "$@" < <(
     echo foo
     echo bar
   )