diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh
index 95ca4a9b..fa768ba3 100644
--- a/inc/temp.inc.sh
+++ b/inc/temp.inc.sh
@@ -181,12 +181,18 @@ CHECKTEMPSENSOR(){
 			fi
 		fi
 		
-		if [ $(bc -l <<< "${temp_f} >= ${temp_warn}") -eq 1 ] && [ $(bc -l <<< "${temp_f} < ${temp_crit}") -eq 1 ]; then
-			[ "${average}" != "" ] && echo -en "${idsCL[Yellow]}WARNING ${spct}${temp_f}${GAUGESH} /${spca}${averagedisp}${GAUGESH}${idsCL[Default]}" || echo -en "${idsCL[Yellow]}WARNING ${spct}${temp_f}${GAUGESH}${idsCL[Default]}"
-		elif [ $(bc -l <<< "${temp_f} >= ${temp_crit}") -eq 1 ]; then
-			[ "${average}" != "" ] && echo -en "${idsCL[LightRed]}CRITICAL${spct}${temp_f}${GAUGESH} /${spca}${averagedisp}${GAUGESH}${idsCL[Default]}" || echo -en "${idsCL[LightRed]}CRITICAL${spct}${temp_f}${GAUGESH}${idsCL[Default]}"
+		if [ "${PW_SENSOR_TYPE[${1}]}" == "system" ] && [[ "${1}" = *"FAN"* ]]; then
+			temp_f_disp=$(IDS_NUMBER_FORMAT ${temp_f} 2 yes)
 		else
-			[ "${average}" != "" ] && echo -en "${idsCL[Green]}Normal  ${spct}${temp_f}${GAUGESH} /${spca}${averagedisp}${GAUGESH}${idsCL[Default]}" || echo -en "${idsCL[Green]}Normal  ${spct}${temp_f}${GAUGESH}${idsCL[Default]}"
+			temp_f_disp=${temp_f}
+		fi
+		
+		if [ $(bc -l <<< "${temp_f} >= ${temp_warn}") -eq 1 ] && [ $(bc -l <<< "${temp_f} < ${temp_crit}") -eq 1 ]; then
+			[ "${average}" != "" ] && echo -en "${idsCL[Yellow]}WARNING ${spct}${temp_f}${GAUGESH} /${spca}${averagedisp}${GAUGESH}${idsCL[Default]}" || echo -en "${idsCL[Yellow]}WARNING ${spct}${temp_f_disp}${GAUGESH}${idsCL[Default]}"
+		elif [ $(bc -l <<< "${temp_f} >= ${temp_crit}") -eq 1 ]; then
+			[ "${average}" != "" ] && echo -en "${idsCL[LightRed]}CRITICAL${spct}${temp_f}${GAUGESH} /${spca}${averagedisp}${GAUGESH}${idsCL[Default]}" || echo -en "${idsCL[LightRed]}CRITICAL${spct}${temp_f_disp}${GAUGESH}${idsCL[Default]}"
+		else
+			[ "${average}" != "" ] && echo -en "${idsCL[Green]}Normal  ${spct}${temp_f}${GAUGESH} /${spca}${averagedisp}${GAUGESH}${idsCL[Default]}" || echo -en "${idsCL[Green]}Normal  ${spct}${temp_f_disp}${GAUGESH}${idsCL[Default]}"
 		fi
 		
 		tmp="${spct}${temp_f}"