diff --git a/lib/server/root.js b/lib/server/root.js
index 787072e3..8668e57a 100644
--- a/lib/server/root.js
+++ b/lib/server/root.js
@@ -10,10 +10,13 @@
     module.exports = function(dir) {
         var root = config('root') || '/';
         
-        if (root === '/' && dir !== '/')
-            dir = mellow.pathToWin(dir);
+        if (dir === '/')
+            dir = root;
         else
-            dir = path.join(root, dir);
+            if (root === '/')
+                dir = mellow.pathToWin(dir);
+            else
+                dir = path.join(root, dir);
         
         log(dir);