1 files changed, 7 insertions, 3 deletions
diff --git a/Completion/Base/_vars b/Completion/Base/_vars
index a81a49f48..43cdf5d2c 100644
--- a/Completion/Base/_vars
+++ b/Completion/Base/_vars
@@ -4,8 +4,6 @@
 # `vared compconfig[<TAB>'.  However, in this version the [ must be
 # added by hand.
 
-local expl
-
 if [[ $PREFIX = *\[* ]]; then
   local var=${PREFIX%%\[*}
   local elt="${PREFIX#*\]}${SUFFIX%\]}"
@@ -16,9 +14,15 @@ if [[ $PREFIX = *\[* ]]; then
     addclose=(-S ']')
   fi
   if [[ ${(tP)var} = assoc* ]]; then
+    local expl
+
+    _tags subscript association-keys || return 1
+
     _description expl 'association key'
     compadd "$expl[@]" $addclose - ${(kP)var}
   fi
 else
-  _parameter
+  _tags any parameters || return 1
+
+  _parameters
 fi