diff --git a/git-flow-feature b/git-flow-feature
index b69cc73ce..226730a9b 100644
--- a/git-flow-feature
+++ b/git-flow-feature
@@ -170,14 +170,10 @@ name_or_current() {
 	fi
 }
 
-parse_cmdline() {
+parse_args() {
 	# parse options
 	FLAGS "$@" || exit $?
 	eval set -- "${FLAGS_ARGV}"
-}
-
-parse_args() {
-	parse_cmdline "$@"
 
 	# read arguments into global variables
 	NAME=$1
@@ -185,7 +181,9 @@ parse_args() {
 }
 
 parse_remote_name() {
-	parse_cmdline "$@"
+	# parse options
+	FLAGS "$@" || exit $?
+	eval set -- "${FLAGS_ARGV}"
 
 	# read arguments into global variables
 	REMOTE=$1