diff --git a/ChangeLog b/ChangeLog
index 86148a574..2323d62c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 2008-03-09  Clint Adams  <clint@zsh.org>
 
-	* 24701: Completion/Unix/Command/_git: use $service instead of
+	* 24701, 24702: Completion/Unix/Command/_git: use $service instead of
 	$words[1] so completion will work if git is an alias to a wrapper.
 
 2008-03-08  Peter Stephenson  <p.w.stephenson@ntlworld.com>
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index d15f3599e..2724be7d0 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -4155,8 +4155,8 @@ __git_is_indexed () {
         __git_aliases_and_commands
         ;;
       (options)
-        curcontext="${curcontext%:*:*}:git-$service:"
-        _call_function ret _git-$service
+        curcontext="${curcontext%:*:*}:git-$words[1]:"
+        _call_function ret _git-$words[1]
         ;;
     esac
   else