--- a/tool/CommandSlaves.cpp	Wed Feb 24 16:27:11 2010 +0100
+++ b/tool/CommandSlaves.cpp	Wed Feb 24 17:24:20 2010 +0100
@@ -125,10 +125,6 @@
         m.open(MasterDevice::Read);
         slaves = selectedSlaves(m);
 
-        if (doIndent) {
-            cout << "Master" << dec << *mi << endl;
-        }
-
         if (getVerbosity() == Verbose) {
             showSlaves(m, slaves);
         } else {
@@ -213,6 +209,10 @@
         aliasIndex++;
     }
 
+    if (infoList.size() && doIndent) {
+        cout << "Master" << dec << m.getIndex() << endl;
+    }
+
     for (iter = infoList.begin(); iter != infoList.end(); iter++) {
         cout << indent << setfill(' ') << right
             << setw(maxPosWidth) << iter->pos << "  "