--- a/opster.py	Sun Jan 23 18:42:41 2011 +0100
+++ b/opster.py	Sun Jan 23 22:10:02 2011 +0100
@@ -151,8 +151,9 @@
     if name == '_completion':       # skip middleware
         worker = lambda: call_cmd(name, func)(*args, **kwargs)
     else:
-        worker = lambda: (call_cmd(name, middleware(func), depth=2)
-                          (*args, **kwargs))
+        mwfunc = middleware(func)
+        depth = func == mwfunc and 1 or 2
+        worker = lambda: call_cmd(name, mwfunc, depth=depth)(*args, **kwargs)
 
     try:
         return catcher(worker, help_func)