diff --git a/powerwall.sh b/powerwall.sh
index 75490d7d..86478191 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -559,7 +559,7 @@ CHECKPOWER(){
 	echo -e "${idsCL[LightCyan]}Total Amps               ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_AMP}A${idsCL[Default]}"
 	echo -e "${idsCL[LightCyan]}Total Wattage            ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_WATT}W${idsCL[Default]}"
 	
-	for ESXIHOST in "${!vHOSTPOWER[@]}"; do
+	for ESXIHOST in "${!PW_iDRACHOST_SHORTNAMES[@]}"; do
 		checked=""
 		until [ "${checked}" != "" ]; do
 			[ -f ${PW_TMPFOLDER}/${ESXIHOST}.hostpower ] && checked=good
@@ -567,14 +567,14 @@ CHECKPOWER(){
 	done
 	
 	echo
-	for ESXIHOST in "${!vHOSTPOWER[@]}"; do
+	for ESXIHOST in "${!PW_iDRACHOST_SHORTNAMES[@]}"; do
 		if [ "${ESXIHOST}" == "10.10.2.26" ]; then
 			watts=0
 		else
 			watts=$(cat ${PW_TMPFOLDER}/${ESXIHOST}.hostpower)
 		fi
 		echo -e "${idsCL[LightCyan]}HOST '${PW_iDRACHOST_SHORTNAMES[${ESXIHOST}]}'     ${idsCL[Default]}: ${idsCL[Green]}${watts}W${idsCL[Default]}"
-	
+		rm -f ${PW_TMPFOLDER}/${ESXIHOST}.hostpower
 	done
 	
 	[ "${action}" != "" ] && echo