diff --git a/bash_completion b/bash_completion
index b53b5dc7..fbd65c76 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1,6 +1,6 @@
 #   bash_completion - some programmable completion functions for bash 2.05b
 #
-#   $Id: bash_completion,v 1.785 2005/01/20 10:10:00 ianmacd Exp $
+#   $Id: bash_completion,v 1.786 2005/01/21 22:29:49 ianmacd Exp $
 #
 #   Copyright (C) Ian Macdonald <ian@caliban.org>
 #
@@ -22,7 +22,7 @@
 #
 #   http://www.caliban.org/bash/index.shtml#completion
 #
-#   RELEASE: 20050120
+#   RELEASE: 20050121
 
 [ -n "${DEBUG:-}" ] && set -v || set +v
 
@@ -3041,6 +3041,9 @@ _command()
 			# so we can set them before handing off to regular
 			# completion routine
 
+			# set current token number to 1 less than now
+			COMP_CWORD=$(( $COMP_CWORD - 1 ))
+
 			# get function name
 			func=${cspec#*-F }
 			func=${func%% *}