diff -r 103524e205ae hb_report/hb_report.in
--- a/hb_report/hb_report.in	Mon Mar 21 13:47:12 2016 +0100
+++ b/hb_report/hb_report.in	Mon May 02 10:03:30 2016 +0900
@@ -1399,7 +1399,7 @@
 (is_master && is_node) ||
 	getlog
 
-if ! is_collector; then
+collect_for_nodes() {
 	for node in $NODES; do
 		if node_needs_pwd $node; then
 			info "Please provide password for `say_ssh_user` at $node"
@@ -1410,6 +1410,14 @@
 			SLAVEPIDS="$SLAVEPIDS $!"
 		fi
 	done
+}
+
+if ! is_collector; then
+        if [ -z "$NO_SSH" ]; then
+                collect_for_nodes $NODES
+        elif is_node; then
+                collect_for_nodes "$WE"
+        fi
 fi
 
 #