diff --git a/git-flow-completion.bash b/git-flow-completion.bash
index c76d323..8049801 100755
--- a/git-flow-completion.bash
+++ b/git-flow-completion.bash
@@ -48,7 +48,7 @@
 _git_flow ()
 {
 	local subcommands="init feature release hotfix"
-	local subcommand="$(__git_find_subcommand "$subcommands")"
+	local subcommand="$(__git_find_on_cmdline "$subcommands")"
 	if [ -z "$subcommand" ]; then
 		__gitcomp "$subcommands"
 		return
@@ -76,7 +76,7 @@
 __git_flow_feature ()
 {
 	local subcommands="list start finish publish track diff rebase checkout pull"
-	local subcommand="$(__git_find_subcommand "$subcommands")"
+	local subcommand="$(__git_find_on_cmdline "$subcommands")"
 	if [ -z "$subcommand" ]; then
 		__gitcomp "$subcommands"
 		return
@@ -123,7 +123,7 @@
 __git_flow_release ()
 {
 	local subcommands="list start finish"
-	local subcommand="$(__git_find_subcommand "$subcommands")"
+	local subcommand="$(__git_find_on_cmdline "$subcommands")"
 	if [ -z "$subcommand" ]; then
 		__gitcomp "$subcommands"
 		return
@@ -149,7 +149,7 @@
 __git_flow_hotfix ()
 {
 	local subcommands="list start finish"
-	local subcommand="$(__git_find_subcommand "$subcommands")"
+	local subcommand="$(__git_find_on_cmdline "$subcommands")"
 	if [ -z "$subcommand" ]; then
 		__gitcomp "$subcommands"
 		return
@@ -171,7 +171,7 @@
 	git flow hotfix list 2> /dev/null
 }
 
-# temporarily wrap __git_find_on_cmdline() for backwards compatibility
-if [ -z "`type -t __git_find_subcommand`" ]; then
-	alias __git_find_subcommand=__git_find_on_cmdline
-fi
\ No newline at end of file
+# alias __git_find_on_cmdline for backwards compatibility
+if [ -z "`type -t __git_find_on_cmdline`" ]; then
+	alias __git_find_on_cmdline=__git_find_subcommand
+fi