diff --git a/build_support/mini_require.js b/build_support/mini_require.js
index a7b0e8f4..a8368e21 100644
--- a/build_support/mini_require.js
+++ b/build_support/mini_require.js
@@ -143,7 +143,8 @@ var lookup = function(parentId, moduleName) {
         var mod = {
             id: moduleName, 
             uri: '',
-            exports: exports
+            exports: exports,
+            packaged: true
         };
         
         var req = function(module, callback) {
diff --git a/lib/ace/worker/worker_client.js b/lib/ace/worker/worker_client.js
index 0a7b1bfb..ffb6bfd6 100644
--- a/lib/ace/worker/worker_client.js
+++ b/lib/ace/worker/worker_client.js
@@ -40,11 +40,11 @@ define(function(require, exports, module) {
 var oop = require("../lib/oop");
 var EventEmitter = require("../lib/event_emitter").EventEmitter;
 
-var WorkerClient = function(topLevelNamespaces, packagedJs, module, classname) {
+var WorkerClient = function(topLevelNamespaces, packagedJs, mod, classname) {
 
     this.changeListener = this.changeListener.bind(this);
 
-    if (window.require.packaged) {
+    if (module.packaged) {
         var base = this.$guessBasePath();
         this.$worker = new Worker(base + packagedJs);
     }
@@ -64,7 +64,7 @@ var WorkerClient = function(topLevelNamespaces, packagedJs, module, classname) {
     this.$worker.postMessage({
         init : true,
         tlns: tlns,
-        module: module,
+        module: mod,
         classname: classname
     });
 
@@ -128,7 +128,7 @@ var WorkerClient = function(topLevelNamespaces, packagedJs, module, classname) {
             if (!src) {
                 continue;
             }
-            var m = src.match(/^(?:(.*\/)ace\.js|(.*\/)ace-uncompressed\.js)(?:\?|$)/);
+            var m = src.match(/^(?:(.*\/)ace\.js|(.*\/)ace(-uncompressed)?(-noconflict)?\.js)(?:\?|$)/);
             if (m)
                 return m[1] || m[2];
         }