diff --git a/powerwall.sh b/powerwall.sh
index b005ce82..dfbd6ce5 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -600,17 +600,17 @@ HOSTPOWER(){
 	# 	idracip=''
 	# fi
 	
-	if [ "${PW_iDRACHOST_SHORTNAMES[${HOST}]}" != "" ]; then
-		tmp=${PW_iDRACHOST_SHORTNAMES[${HOST}]}
+	if [ "${PW_iDRACHOST_SHORTNAMES[${1}]}" != "" ]; then
+		tmp=${PW_iDRACHOST_SHORTNAMES[${1}]}
 		ESXI_HOST=${PW_HOST_ADDRESSES[${tmp}]}
-	elif [ "${PW_ESXI_HOST_NAMES[${HOST}]}" != "" ]; then
-		ESXI_HOST=${HOST}
-	elif [ "${PW_HOST_ADDRESSES[iDS-vMS-Host${HOST}]}" != "" ]; then
-		ESXI_HOST=${PW_HOST_ADDRESSES[iDS-vMS-Host${HOST}]}
-	elif ([ "${HOST::1}" == "o" ] || [ "${HOST::1}" == "O" ]) && [ "${PW_HOST_ADDRESSES[OFF-vMS-Host${HOST: -1}]}" != "" ]; then
-		ESXI_HOST=${PW_HOST_ADDRESSES[OFF-vMS-Host${HOST: -1}]}
-	elif [ "${PW_HOST_ADDRESSES[${HOST}]}" != "" ]; then
-		ESXI_HOST=${PW_HOST_ADDRESSES[${HOST}]}
+	elif [ "${PW_ESXI_HOST_NAMES[${1}]}" != "" ]; then
+		ESXI_HOST=${1}
+	elif [ "${PW_HOST_ADDRESSES[iDS-vMS-Host${1}]}" != "" ]; then
+		ESXI_HOST=${PW_HOST_ADDRESSES[iDS-vMS-Host${1}]}
+	elif ([ "${1::1}" == "o" ] || [ "${1::1}" == "O" ]) && [ "${PW_HOST_ADDRESSES[OFF-vMS-Host${1: -1}]}" != "" ]; then
+		ESXI_HOST=${PW_HOST_ADDRESSES[OFF-vMS-Host${1: -1}]}
+	elif [ "${PW_HOST_ADDRESSES[${1}]}" != "" ]; then
+		ESXI_HOST=${PW_HOST_ADDRESSES[${1}]}
 	elif [ "${1^^}" == "ALL" ] || [ "${1^^}" == "MAINSITE" ] || [ "${1^^}" == "OFFSITE" ] || [ "${1^^}" == "MAIN" ] || [ "${1^^}" == "SYS" ]; then
 		ESXI_HOST=${HOST^^}
 		MN=1