diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index 3bab328d..e4e647bd 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -771,7 +771,7 @@ BACKUP_UNIFINVR(){
 }
 
 RUN_COMMAND(){
-	while [ $# -gt 0 ]; do
+	while [ "$#" -gt 0 ]; do
 	    case "${1}" in
 	        -nt|-nodetype) nodetype=${2^^};;
 			-cmd) RUNCMD="${2}";;
@@ -779,6 +779,7 @@ RUN_COMMAND(){
 		shift
 	done
 	if [ "${nodetype}" == "ALL" ] || [ -n "${nodetype}" ]; then
+		nodetype=ALL
 		NT_HOSTS=ALL_HOSTS[@]
 		NTS=(${NM_NODE_TYPES[*]})
 	elif [ "${nodetype}" != "" ]; then