From 2bd8eae66b0c13fc7deeeb473a71bd14bec90d9c Mon Sep 17 00:00:00 2001
From: gsuess <garic.suess@gmail.com>
Date: Thu, 22 Jan 2015 00:08:54 +0100
Subject: [PATCH] Npm.require load correct submodule

---
 tools/server/boot.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/server/boot.js b/tools/server/boot.js
index 7d470d4cc8..95940d3e66 100644
--- a/tools/server/boot.js
+++ b/tools/server/boot.js
@@ -129,10 +129,11 @@ Fiber(function () {
           return require(name);
         }
 
-        var nodeModuleDir =
-          path.resolve(serverDir, fileInfo.node_modules, name.split("/")[0]);
+        var nodeModuleBase = path.resolve(serverDir, fileInfo.node_modules);
 
-        if (fs.existsSync(nodeModuleDir)) {
+        var nodeModuleDir = path.resolve(nodeModuleBase, name);
+
+        if (fs.existsSync(path.resolve(nodeModuleBase, name.split("/")[0]))) {
           return require(nodeModuleDir);
           }
         try {