diff --git a/lib/ace/worker/worker_client.js b/lib/ace/worker/worker_client.js
index 566498b5..5530240a 100644
--- a/lib/ace/worker/worker_client.js
+++ b/lib/ace/worker/worker_client.js
@@ -12,9 +12,9 @@ var oop = require("pilot/oop");
 var EventEmitter = require("pilot/event_emitter").EventEmitter;
 
 var WorkerClient = function(topLevelNamespaces, packagedJs, module, classname) {
-    
+
     this.callbacks = [];
-    
+
     if (require.packaged) {
         var base = this.$guessBasePath();
         var worker = this.$worker = new Worker(base + packagedJs);
@@ -22,14 +22,14 @@ var WorkerClient = function(topLevelNamespaces, packagedJs, module, classname) {
     else {
         var workerUrl = require.nameToUrl("ace/worker/worker", null, "_");
         var worker = this.$worker = new Worker(workerUrl);
-    
+
         var tlns = {};
         for (var i=0; i<topLevelNamespaces.length; i++) {
             var ns = topLevelNamespaces[i];
             tlns[ns] = require.nameToUrl(ns, null, "_").replace(/.js$/, "");
         }
     }
-    
+
     this.$worker.postMessage({
         init : true,
         tlns: tlns,
@@ -74,9 +74,11 @@ var WorkerClient = function(topLevelNamespaces, packagedJs, module, classname) {
     this.$guessBasePath = function() {
         var scripts = document.getElementsByTagName("script");
         for (var i=0; i<scripts.length; i++) {
-            var m = scripts[i].src.match(/^(.*\/)ace\.js$/);
-            if (m) 
-                return m[1];
+            var m = scripts[i].src.
+                        match(/^(.*\/)ace\.js$|^(.*\/)ace-uncompressed\.js$/);
+            if (m) {
+                return m[1] || m[2];
+            }
         }
         return "";
     };
@@ -98,7 +100,7 @@ var WorkerClient = function(topLevelNamespaces, packagedJs, module, classname) {
         }
         this.send(cmd, args);
     };
-    
+
     this.emit = function(event, data) {
         this.$worker.postMessage({event: event, data: data});
     };