diff --git a/build_support/mini_require.js b/build_support/mini_require.js
index afa7b8e3..a3e01b04 100644
--- a/build_support/mini_require.js
+++ b/build_support/mini_require.js
@@ -43,7 +43,12 @@
  
 (function() {
     
-var _define = function(module, payload) {
+if (window.require) {
+    require.packaged = true;
+    return;
+}
+    
+var _define = function(module, deps, payload) {
     if (typeof module !== 'string') {
         if (_define.original)
             _define.original.apply(window, arguments);
@@ -76,13 +81,12 @@ var _require = function(module, callback) {
             if (!dep && _require.original)
                 return _require.original.apply(window, arguments);
             params.push(dep);
-        };
+        }
         if (callback) {
             callback.apply(null, params);
         }
     }
-
-    if (typeof module === 'string') {
+    else if (typeof module === 'string') {
         var payload = lookup(module);
         if (!payload && _require.original)
             return _require.original.apply(window, arguments);
@@ -92,8 +96,12 @@ var _require = function(module, callback) {
         }
     
         return payload;
-    };
-}
+    }
+    else {
+        if (_require.original)
+            return _require.original.apply(window, arguments);
+    }
+};
 
 if (window.require)
     _require.original = window.require;
diff --git a/build_support/mini_require_textarea.js b/build_support/mini_require_textarea.js
index 9161bcf6..be4f40d3 100644
--- a/build_support/mini_require_textarea.js
+++ b/build_support/mini_require_textarea.js
@@ -44,7 +44,7 @@
 
 (function() {
 
-var _define = function(module, payload) {
+var _define = function(module, deps, payload) {
     if (typeof module !== 'string') {
         if (_define.original)
             _define.original.apply(window, arguments);
diff --git a/lib/ace/worker/worker.js b/lib/ace/worker/worker.js
index 5238cc25..04f43a04 100644
--- a/lib/ace/worker/worker.js
+++ b/lib/ace/worker/worker.js
@@ -30,11 +30,14 @@ var require = function(id) {
 require.modules = {};
 require.tlns = {};
 
-var define = function(id, factory) {
-    if (!factory) {
+var define = function(id, deps, factory) {
+    if (arguments.length == 2) {
+        factory = deps;
+    } else if (arguments.length == 1) {
         factory = id;
         id = require.id;
     }
+    
     if (id.indexOf("text!") === 0) 
         return;