diff --git a/defaults.inc b/defaults.inc
index aa680b76..550513b8 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -131,7 +131,7 @@ if [ "${RNIP}" == "${NM_NODEMANAGER}" ]; then
 	RUN_NODE_IP=${RNIP}
 else
 	for NTYPE in "${NM_NODE_TYPES[@]}"; do
-		if [ "${1}" != "service" ] || ([ "${1}" == "service" ] && [[ "${NM_SERVICES_CHECK[${NTYPE}]}" = *"${2}"* ]]); then
+		if [ "${1}" != "service" ] || ([ "${1}" == "service" ] && ([[ "${NM_SERVICES_CHECK[${NTYPE}]}" = *"${2}"* ]] || [ "${NTYPE}" == "${2^^}" ])); then
 			var=${NTYPE}_HOSTS[@]
 			RUN_NODE_TYPE=""
 			for nip in "${!var}"; do