diff --git a/bin/azw b/bin/azw
index 7aca63a..a9f799a 100755
--- a/bin/azw
+++ b/bin/azw
@@ -13,12 +13,13 @@ function buildExternCommandName() {
 			return 10
 		fi
 	done
+	args=("$@")
 }
 
 function dispatchToExtern() {
-	local cmdName=
+	local cmdName= args=()
 	buildExternCommandName "$@" || return $?
-	$cmdName "$@"
+	$cmdName "${args[@]}"
 }
 
 function dispatchCommand() {