diff --git a/bash_completion b/bash_completion
index 5ded3583..42e60be4 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.425 2002/10/05 09:31:43 ianmacd Exp $
+#   $Id: bash_completion,v 1.426 2002/10/05 09:33:14 ianmacd Exp $
 #
 #   Copyright (C) Ian Macdonald <ian@caliban.org>
 #
@@ -1002,13 +1002,13 @@ _cvs()
 	COMPREPLY=()
 	cur=${COMP_WORDS[COMP_CWORD]}
 
-	count=1
+	count=0
 	for i in ${COMP_WORDS[@]}; do
 		[ $count -eq $COMP_CWORD ] && break
 		if [ -z "$mode" ]; then
 			case $i in
 			-d)
-				cvsroot=${COMP_WORDS[((++count))]}
+				cvsroot=${COMP_WORDS[((count+1))]}
 				;;
 			@(add|new))
 				mode=add
@@ -1043,7 +1043,6 @@ _cvs()
 			*)
 				;;
 			esac
-			continue
 		elif [[ "$i" = -* ]]; then
 			flags=( ${flags[@]} $i )
 		fi