diff --git a/inc/services.inc b/inc/services.inc
index f8a91ac6..6d272f77 100755
--- a/inc/services.inc
+++ b/inc/services.inc
@@ -60,8 +60,8 @@ Server did not start serving DNS requests within 20mins you moron...." 1
 						for docker in "${!dockerstocheck}"; do
 							for nip in "${!hosts}"; do
 								if [[ "${RUN_NODE_IP}" != *"${nip}"* ]] && [ "$(CHECK_HOST ${nip})" != "false" ]; then
-									${SSHCMD} root@${nip} '[ "$(docker ps -q -f name='${docker}')" ] && docker stop '${docker} >/dev/null 2>&1
-									[ "${docker}" == "authelia" ] && ${SSHCMD} root@${nip} '[ "$(docker ps -q -f name=auth_redis)" ] && docker stop auth_redis' >/dev/null 2>&1
+									${SSHCMD} root@${nip} '[ "$(docker ps -a -q -f name='${docker}')" ] && docker stop '${docker} >/dev/null 2>&1
+									[ "${docker}" == "authelia" ] && ${SSHCMD} root@${nip} '[ "$(docker ps -a -q -f name=auth_redis)" ] && docker stop auth_redis' >/dev/null 2>&1
 								fi
 							done
 						done
@@ -77,7 +77,7 @@ Server did not start serving DNS requests within 20mins you moron...." 1
 						fi
 					done
 					for docker in "${!dockerstocheck}"; do
-						if [ ! "$(docker ps -q -f name=${docker})" ]; then
+						if [ ! "$(docker ps -a -q -f name=${docker})" ]; then
 							[ "${docker}" == "authelia" ] && docker start auth_redis && sleep 2s >/dev/null 2>&1
 							docker start ${docker} >/dev/null 2>&1
 						fi
@@ -97,7 +97,7 @@ Server did not start serving DNS requests within 20mins you moron...." 1
 						fi
 					done
 					for docker in "${!dockerstocheck}"; do
-						[ "$(docker ps -q -f name=${docker})" ] && docker stop ${docker} & >/dev/null 2>&1
+						[ "$(docker ps -a -q -f name=${docker})" ] && docker stop ${docker} & >/dev/null 2>&1
 					done
 					[ -f ${NM_TMPFOLDER}/.singleserver.${1^^}.primary ] && rm -f ${NM_TMPFOLDER}/.singleserver.${1^^}.primary
 				# fi
diff --git a/inc/status.inc b/inc/status.inc
index d219bcb6..d1989b91 100755
--- a/inc/status.inc
+++ b/inc/status.inc
@@ -771,7 +771,7 @@ STATUS_NODE(){
 						if [ ! -f ${NM_TMPFOLDER}/${nip}~${docker}.disable ] && ([ ${SDCHK} == true ] || [ ${SDCHK} == primary ]); then
 							[ "${STATUS_ACTION}" != "check" ] && echo -en "${idsCL[White]} ${NM_DOCKER_DESC[${docker}]}$spc${idsCL[Default]}: "
 						
-							if [ ! "$(${NCMD} docker ps -q -f name=${docker})" ]; then
+							if [ ! "$(${NCMD} docker ps -a -q -f name=${docker})" ]; then
 								#if [ ! -f ${NM_TMPFOLDER}/${nip}~${docker}.disable ] && ([ "${nip}" = "10.2.1.5" ] || [[ "${nip}" != *"10.2."* ]] || ([[ "${nip}" = *"10.2."* ]] && [ ! -f ${PW_TMPFOLDER}/OFF-vMS-Host1.down ])); then
 								if [ ! -f ${NM_TMPFOLDER}/${nip}~${docker}.disable ]; then
 									
@@ -802,7 +802,7 @@ STATUS_NODE(){
 										fi
 										touch ${NM_TMPFOLDER}/${nip}~${docker}.fix
 										sleep 10s
-										if [ "$(${NCMD} docker ps -q -f name=${docker})" ]; then
+										if [ "$(${NCMD} docker ps -a -q -f name=${docker})" ]; then
 											[ "${STATUS_ACTION}" != "check" ] && echo -en "${idsCL[Green]}Running - Fixed"
 											[ -f ${NM_TMPFOLDER}/${nip}~${docker}.sent ] && SENDNOTICE "${NM_HOSTNAMES[${nip}]}[${nip}]" "'${docker}' ${NM_DOCKER_DESC[${docker}]} - is fixed"
 											rm -f ${NM_TMPFOLDER}/${nip}~${docker}.*