diff --git a/powerwall.sh b/powerwall.sh
index 7aba8e4d..062ff5b3 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -86,7 +86,7 @@ CHECKTEMP(){
 				fi
 				
 			else
-				([ "${SENSOR}" == "Powerwall-CPU" ] || [ "${SENSOR}" == "OctoPi-CPU" ]) && echo -en "\033[1A"
+				[[ "${SENSOR}" == *"CPU-Usage"* ]] && echo -en "\033[1A"
 				[ "${avgdays}" != "noavg" ] && echo -en "${idsCL[Yellow]}Pulling data and calculating averages for '${SENSOR}' ... " || echo -en "${idsCL[Yellow]}Pulling data for '${SENSOR}' ... "
 				reading=$(CHECKTEMPSENSOR ${SENSOR} . . . . ${avgdays})
 				c=0; spc=''; spc1=`expr ${cw} - ${#SENSOR}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; c=`expr ${c} + 1`; done