diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh
index 15a90cb1..004ccc2f 100644
--- a/inc/temp.inc.sh
+++ b/inc/temp.inc.sh
@@ -222,8 +222,10 @@ CHECKTEMP(){
 					for M in 15 30 60 120; do
 						lico=" "
 						if [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "system" ] && [[ "${SENSOR}" = *"FAN"* ]]; then
+							spc_cnt=6
 							OLD_temp_f=($(${mysql_conn} -e "SELECT speed FROM servermonitor.sensor_data WHERE sensorid='${PW_SENSOR_ID[${SENSOR}]}' AND date >= DATE_SUB(NOW(), INTERVAL ${M} MINUTE) AND date <= DATE_SUB(NOW(), INTERVAL $(expr ${M} - 7) MINUTE) ORDER BY date ASC LIMIT 1"))
 						else
+							spc_cnt=7
 							OLD_temp_f=($(${mysql_conn} -e "SELECT temp FROM servermonitor.sensor_data WHERE sensorid='${PW_SENSOR_ID[${SENSOR}]}' AND date >= DATE_SUB(NOW(), INTERVAL ${M} MINUTE) AND date <= DATE_SUB(NOW(), INTERVAL $(expr ${M} - 7) MINUTE) ORDER BY date ASC LIMIT 1"))
 						fi
 						OLD_temp_f=${OLD_temp_f[1]}
@@ -254,7 +256,8 @@ CHECKTEMP(){
 						echo -en "${idsCL[Default]}                   "
 						[ ${#M} -eq 2 ] && echo -n " "
 						if [ "${OLD_temp_f}" != "" ]; then
-							c=0; spc=''; spc1=`expr 7 - ${#OLD_temp_f}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
+							
+							c=0; spc=''; spc1=`expr ${spc_cnt} - ${#OLD_temp_f}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
 							echo -en "${lclr}~${M}m ago - ${lclr}${lico}${spc}"
 							[ "${PW_SENSOR_TYPE[${SENSOR}]}" == "system" ] && [[ "${SENSOR}" = *"FAN"* ]] && echo -e "$(IDS_NUMBER_FORMAT ${OLD_temp_f})${GAUGESH}" || echo -e "${OLD_temp_f}${GAUGESH}"
 						else