diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index ccc9d1ff..62f3bf24 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -22,7 +22,7 @@ GET_HOST_FANSPEED(){
 	for ESXIHOST in "${PW_ALLHOSTS[@]}"; do
 		vHOSTFAN=$(ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${PW_RACADM_ACCESS} racadm -r ${PW_HOST_IDRACS[${PW_ESXI_HOST_NAMES[${ESXIHOST}]}]} -u ${PW_ESXI_USER} -p "'${PW_ESXI_PASS}'" getsensorinfo | grep "System Board Fan1" 2>&1)
 		FanSpeed=$(echo ${vHOSTFAN} | awk '/ / {print $8}' | sed -e 's/%//g')
-		echo ${FanSpeed} > ${PW_TMPFOLDER}/.fanspeed.${ESXIHOST}
+		echo ${FanSpeed} > ${PW_TMPFOLDER}/.fanspeed.${PW_ESXI_HOST_NAMES[${ESXIHOST}]}
 	done
 }
 
@@ -334,9 +334,9 @@ CHECKPOWER(){
 								# vHOSTFAN=$(snmpwalk -v 1 -c public -t 2 ${PW_HOST_IDRACS[${SENSOR}]} .1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3 -O vq)
 								# FanSpeed=$(ROUND_NUMBER `echo "scale=0; $(ROUND_NUMBER `echo "scale=4; ${vHOSTFAN}/21200" | bc` 2)*100/1" | bc` 0)
 								echo -en "${idsCL[LightCyan]}	Getting FanSpeed..."
-								until [ -f ${PW_TMPFOLDER}/.fanspeed.${PW_ESXI_HOST_NAMES[${SENSOR}]} ]; do tmp=tmp; done
-								echo -en "\r\033[K${MSG}${idsCL[Cyan]}	[PS1=${idsCL[LightCyan]}${PS1}'A${idsCL[Cyan]}, PS2=${idsCL[LightCyan]}${PS2}'A${idsCL[Cyan]}]${idsCL[LightCyan]}	[FanSpeed=$(cat ${PW_TMPFOLDER}/.fanspeed.${PW_ESXI_HOST_NAMES[${SENSOR}]})'%]"
-								rm -f ${PW_TMPFOLDER}/.fanspeed.${PW_ESXI_HOST_NAMES[${SENSOR}]}
+								until [ -f ${PW_TMPFOLDER}/.fanspeed.${SENSOR} ]; do tmp=tmp; done
+								echo -en "\r\033[K${MSG}${idsCL[Cyan]}	[PS1=${idsCL[LightCyan]}${PS1}'A${idsCL[Cyan]}, PS2=${idsCL[LightCyan]}${PS2}'A${idsCL[Cyan]}]${idsCL[LightCyan]}	[FanSpeed=$(cat ${PW_TMPFOLDER}/.fanspeed.${SENSOR})'%]"
+								rm -f ${PW_TMPFOLDER}/.fanspeed.${SENSOR}
 								
 							# else
 							# 	echo -en "${idsCL[Cyan]}	[PS1=${idsCL[LightCyan]}${PS1}'A${idsCL[Cyan]}, PS2=${idsCL[LightCyan]}${PS2}'A${idsCL[Cyan]}]"