--- pacman-bash_completion-011410	2010-01-14 16:46:20.730896967 -0430
+++ /etc/bash_completion.d/pacman	2010-01-14 17:10:22.000000000 -0430
@@ -45,7 +45,7 @@
     _filedir; _arch_rem_selected; return 0
   else
     for w in "${!COMP_WORDS[@]}"; do
-      (( w == COMP_CWORD || w == 0 )) && continue
+      (( w == 0 )) && continue
       [[ ${COMP_WORDS[w]} == @(--@(help|cleancache)|-*[hC]*) ]] && return 0
       for o in "${!long[@]}"; do
         if [[ ${COMP_WORDS[w]} == ${long[o]} ]]; then
@@ -144,7 +144,7 @@
       # Use the short array
       command eval "list=($(command sed 's,.*,\${&[1]},' <<<"${m#* }"; IFS=' '; echo ${common[1]}))"
       for w in "${!COMP_WORDS[@]}"; do
-        (( w == COMP_CWORD || w == 0 )) && continue
+        (( w == 0 )) && continue
         if [[ ${COMP_WORDS[w]} == -*([^-])[hV]* ]]; then
           return 0
         fi