diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index c355f6f4..8ac96f9d 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -362,28 +362,23 @@ STATUS(){
 	########################
 	if [ "${ST_ACTION}" = "" ] || [ "${ST_ACTION}" = "report" ] || [ "${ST_ACTION}" = "freespace" ]; then
 		if [ "${ST_ACTION}" != "repl" ] && [ "${ST_ACTION}" != "services" ]; then
-			if [ "${ST_ACTION}" != "check" ]; then
-				echo -e "${idsST[Bold]}"; DIVIDER
-				echo -e "${idsCL[Yellow]} ${NM_NODETYPES[$NTYPE]}-Node Free Space Scan${idsCL[Default]}"
-				DIVIDER; echo -e "${idsST[Reset]}"
-			fi
-		
-		
 			for NTYPE in "${NODE_TYPES[@]}"; do
+				if [ "${ST_ACTION}" != "check" ]; then
+					echo -e "${idsST[Bold]}"; DIVIDER
+					echo -e "${idsCL[Yellow]} ${NM_NODETYPES[$NTYPE]}-Node Free Space Scan${idsCL[Default]}"
+					DIVIDER; echo -e "${idsST[Reset]}"
+				fi
 				nid=1
 				var=${NTYPE}_HOSTS[@]
 				for nip in "${!var}"; do
 					if [[ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) == *"${nip}"* ]]; then NCMD=''; LH='- localhost'
 						else NCMD="ssh root@${nip}"; LH=''
 					fi
-					if [ "${NCMD}" != "" ]; then
-						checkhost=$(CHECK_HOST ${nip})
-					fi
 					if [ "${ST_ACTION}" != "check" ]; then
 						echo -e " ${idsST[Bold]}${idsCL[LightCyan]}${NM_NODETYPES[$NTYPE]}-Node${nid} (${nip})${idsST[Reset]}${idsCL[LightCyan]} ${idsCL[LightYello]}${LH}${idsCL[Default]}"
 						DIVIDER false green
 					fi	
-					df -hBM | grep -vE '^Filesystem|tmpfs|cdrom' | awk '{ print $5 " " $1 }' | while read output; do
+					${NCMD} df -hBM | grep -vE '^Filesystem|tmpfs|cdrom' | awk '{ print $5 " " $1 }' | while read output; do
 						freespace=$(echo $output | awk '{ print $1}' | cut -d'%' -f1  )
 						partition=$(echo $output | awk '{ print $2 }' )
 						if [ "${ST_ACTION}" != "check" ]; then