diff --git a/lib/server/commander.js b/lib/server/commander.js
index fc597b41..5b303c0c 100644
--- a/lib/server/commander.js
+++ b/lib/server/commander.js
@@ -14,6 +14,7 @@
         fs                  = main.fs,
         zlib                = main.zlib,
         url                 = main.url,
+        querystring         = main.querystring,
         CloudFunc           = main.cloudfunc,
         DIR                 = main.DIR,
         LIBDIR              = main.LIBDIR,
@@ -344,6 +345,7 @@
         var lParsedUrl  = url.parse(pReq.url),
             lPath       = lParsedUrl.pathname;
         
+        lPath           = querystring.unescape(lPath);
         return lPath;
     }