diff --git a/bash_completion b/bash_completion
index 588b0c2d..3e5c813a 100644
--- a/bash_completion
+++ b/bash_completion
@@ -636,7 +636,7 @@ _variables()
                 _filedir
                 for i in ${!COMPREPLY[@]}; do
                     if [[ ${COMPREPLY[i]} == *.tab ]]; then
-                        unset COMPREPLY[i]
+                        unset 'COMPREPLY[i]'
                         continue
                     elif [[ -d ${COMPREPLY[i]} ]]; then
                         COMPREPLY[i]+=/
@@ -1686,7 +1686,7 @@ _command_offset()
         COMP_WORDS[i]=${COMP_WORDS[i+$word_offset]}
     done
     for (( i; i <= COMP_CWORD; i++ )); do
-        unset COMP_WORDS[i]
+        unset 'COMP_WORDS[i]'
     done
     ((COMP_CWORD -= $word_offset))