diff --git a/aossceilo/tidy.py b/aossceilo/tidy.py
index a71727b78c043dbda779cef8294a661efec733f7..6c92592533bd74264ebc0aceec70cce87452fd22 100644
--- a/aossceilo/tidy.py
+++ b/aossceilo/tidy.py
@@ -245,6 +245,11 @@ def main():
         default="",
         help="used in product filename, see metobs.util for details",
     )
+    parser.add_argument(
+        "command",
+        nargs="*",
+        help="Command to run (use 'help' for available options)",
+    )
     args = parser.parse_args()
     if args.self_test:
         import doctest
@@ -305,12 +310,13 @@ def main():
         }
     )
 
-    if (not args) or (args[0] not in commands):
+    command = args.command
+    if not command or command[0] not in commands:
         parser.print_help()
         _help()
         return 9
     else:
-        locals()[args[0]](*args[1:])
+        commands[command[0]](*command[1:])
 
     return 0