diff --git a/tool/main.cpp b/tool/main.cpp
index b5f5d4b4..16a65eae 100644
--- a/tool/main.cpp
+++ b/tool/main.cpp
@@ -337,6 +337,7 @@ int main(int argc, char **argv)
     if (commands.size()) {
         if (commands.size() == 1) {
             cmd = commands.front();
+            commandName = cmd->name;
             if (!helpRequested) {
                 masterDev.setIndex(masterIndex);
                 retval = cmd->execute();