diff --git a/powerwall.sh b/powerwall.sh
index 9f4cd855..d5bc6cc7 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -519,7 +519,7 @@ HOSTMGMT(){
 		cHOST='-help'
 	fi
 	echo "HERE: ${cHOST}"
-	while [ $# -gt 0 ]; do
+	while [ "${cHOST}" != "" ]; do
 		case "${cHOST}" in
 			-p|-power) POWER=${2}; MODE="power";;
 			-e|-esxi) ESXI=${2}; MODE="esxi";;