diff --git a/powerwall.sh b/powerwall.sh
index 607b78c1..4bae8dbc 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -553,7 +553,7 @@ CHECKPOWER(){
 			OUTPUTA=`echo ${INVSTATSINFO} | jq '.outputs .outA'`
 			OUTPUTA2=`echo "scale=1; ${OUTPUTA}*2" | bc`
 			OUTPUTW=`echo ${INVSTATSINFO} | jq '.outputs .outW'`
-			[[ "${OUTPUTW}" == *"."* ]] && OUTPUTW=`printf "%'.1f\n" ${OUTPUTW}` || OUTPUTW=`printf "%'.0f\n" ${OUTPUTW}`
+			[[ "${OUTPUTW}" == *"."* ]] && [[ "${OUTPUTW}" != *".0"* ]] && OUTPUTW=`printf "%'.1f\n" ${OUTPUTW}` || OUTPUTW=`printf "%'.0f\n" ${OUTPUTW}`
 			BATTV=`echo ${INVSTATSINFO} | jq '.inputs .battV'`
 			BATTA=`echo ${INVSTATSINFO} | jq '.inputs .xfA'`
 		fi
@@ -572,7 +572,7 @@ CHECKPOWER(){
 		if [ "$(CHECK_HOST 10.10.1.205)" != "false" ]; then
 			SVRRM_VOLT=$(snmpwalk -v 1 -c public 10.10.1.205 iso.3.6.1.2.1.33.1.4.4.1.2.1 | sed 's/.*: //')
 			SVRRM_WATT=$(snmpwalk -v 1 -c public 10.10.1.205 iso.3.6.1.2.1.33.1.4.4.1.4.1 | sed 's/.*: //')
-			[[ "${SVRRM_WATT}" == *"."* ]] && SVRRM_WATT_disp=`printf "%'.1f\n" ${SVRRM_WATT}` || SVRRM_WATT_disp=`printf "%'.0f\n" ${SVRRM_WATT}`
+			[[ "${SVRRM_WATT}" == *"."* ]] && [[ "${SVRRM_WATT}" != *".0"* ]] && SVRRM_WATT_disp=`printf "%'.1f\n" ${SVRRM_WATT}` || SVRRM_WATT_disp=`printf "%'.0f\n" ${SVRRM_WATT}`
 			SVRRM_AMP=$(snmpwalk -v 1 -c public 10.10.1.205 iso.3.6.1.2.1.33.1.4.4.1.3.1 | sed 's/.*: //')
 			SVRRM_AMP=`echo "scale=1; ${SVRRM_AMP}/10" | bc`
 		fi
@@ -593,7 +593,7 @@ CHECKPOWER(){
 			if [ "$(CHECK_HOST 10.10.1.210)" != "false" ]; then
 				NETRK_AMP=`echo "scale=1; ${SVRRM_AMP}-${APCPDU_AMP}" | bc`
 				NETRK_WATT=`echo "scale=0; ${SVRRM_WATT}-${APCPDU_WATT}" | bc`
-				[[ "${NETRK_WATT}" == *"."* ]] && NETRK_WATT=`printf "%'.1f\n" ${NETRK_WATT}` || NETRK_WATT=`printf "%'.0f\n" ${NETRK_WATT}`
+				[[ "${NETRK_WATT}" == *"."* ]] && [[ "${NETRK_WATT}" != *".0"* ]] && NETRK_WATT=`printf "%'.1f\n" ${NETRK_WATT}` || NETRK_WATT=`printf "%'.0f\n" ${NETRK_WATT}`
 			fi
 			VOLT_DROP=`echo "scale=1; ${OUTPUTV2}-${SVRRM_VOLT}" | bc`
 		fi
@@ -617,7 +617,7 @@ CHECKPOWER(){
 					host=${hostfile%.*}; host=${host##*/}
 					if [ "${host}" != "*" ] && [ "${host}" != "done" ]; then
 						watts=$(cat ${hostfile})
-						[[ "${watts}" == *"."* ]] && watts=`printf "%'.1f\n" ${watts}` || watts=`printf "%'.0f\n" ${watts}`
+						[[ "${watts}" == *"."* ]] && [[ "${watts}" != *".0"* ]] && watts=`printf "%'.1f\n" ${watts}` || watts=`printf "%'.0f\n" ${watts}`
 						if [ "${watts}" == "down" ]; then hostpower="${idsCL[Red]}Host Offline"
 							elif [ "${watts}" == "0" ]; then hostpower="${idsCL[Default]}n/a"
 							else hostpower="${idsCL[Green]}${watts}'W"