diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index eb102d27..b1bf8034 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -1181,12 +1181,20 @@ CHECK_NPMCERTS(){
 CHECK-CERTS(){
 	if [ "${1}" == "check" ]; then
 		rm -f ${FOLDER}/ssl-cert-check.lastrun
-		${FOLDER}/ssl-cert-check/ssl-cert-check -a -f ${FOLDER}/ssl-cert-check/ssldomains > ${FOLDER}/ssl-cert-check.lastrun
+		${FOLDER}/ssl-cert-check/ssl-cert-check -f ${FOLDER}/ssl-cert-check/ssldomains > ${FOLDER}/ssl-cert-check.lastrun
 		SSLLOG="$(cat ${FOLDER}/ssl-cert-check.lastrun)"
 		SENDNOTICE "SSL Certs Check" "SSL Certs Check\n$SSLLOG"
-		
 	else
-		${FOLDER}/ssl-cert-check/ssl-cert-check -a -f ${FOLDER}/ssl-cert-check/ssldomains
+		# ${FOLDER}/ssl-cert-check/ssl-cert-check -f ${FOLDER}/ssl-cert-check/ssldomains
+	    for LINE in `egrep -v '(^#|^$)' ${FOLDER}/ssl-cert-check/ssldomains`;  do
+	        HOST=${LINE%% *}
+	        PORT=${LINE#* }
+			echo "$HOST - $PORT"
+			# IFS=','; NEW_CERTS=(${NEW_CERT}); unset IFS
+			# 	        IFS=" "
+			# 	        [ "$PORT" == "FILE" ] && check_file_status ${HOST} "FILE" "${HOST}" || check_server_status "${HOST}" "${PORT}"
+			# unset IFS
+	    done
 	fi
 }