diff --git a/inc/status.inc b/inc/status.inc
index e97ed2b8..f29f58ad 100755
--- a/inc/status.inc
+++ b/inc/status.inc
@@ -496,7 +496,6 @@ STATUS(){
 									elif [ -f ${NM_TMPFOLDER}/repl.${rcheck}.${nip}.timeout ]; then
 										checked=timeout
 									fi
-									rm -f ${NM_TMPFOLDER}/repl.${rcheck}.${nip}.*
 								done
 
 								if [ "${checked}" == "timeout" ]; then
@@ -552,6 +551,7 @@ STATUS(){
 								${PH_CMD} rm -f ${NM_FOLDER}/test.repl &
 								${PH_CMD} rm -f ${NM_REPL_CHECK_LOC[${rcheck}]}/test.repl &
 							fi
+							rm -f ${NM_TMPFOLDER}/repl.${rcheck}.*
 						done
 					fi
 				fi
diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index 23024cc1..3646919f 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -793,9 +793,8 @@ GUI(){
 			fi;;
 		status)
 			if [ -f "${NM_FOLDER}/status-check.running" ]; then
-				fd=`stat --format=%Y "${NM_FOLDER}/status-check.running"`
-				cbd=$((`date +%s` - 450))
-				[ ${fd} -lt ${cbd} ] && rm -f "${NM_FOLDER}/status-check.running"
+				cbd=`date +%s`-$(stat -c %Y ${NM_FOLDER}/status-check.running)
+				[ ${cbd} -gt 900 ] && rm -f "${NM_FOLDER}/status-check.running"
 			fi
 			if [ ! -f "${NM_FOLDER}/status-check.running" ]; then
 				touch "${NM_FOLDER}/status-check.running"