diff --git a/dist/env.js b/dist/env.js
index c998d317..94f6d8ee 100644
--- a/dist/env.js
+++ b/dist/env.js
@@ -123,6 +123,7 @@ Envjs.loadLocalScript = function(script){
         src, 
         i, 
         base,
+        filename,
         // SMP: see also the note in html/document.js about script.type
         script_type = script.type === null ? 
             "text/javascript" : script.type;
@@ -163,7 +164,8 @@ Envjs.loadLocalScript = function(script){
             }
         }
         base = "" + script.ownerDocument.location;
-        var filename = Envjs.location(script.src.match(/([^\?#]*)/)[1], base );
+        //filename = Envjs.location(script.src.match(/([^\?#]*)/)[1], base );
+        filename = Envjs.location(script.src, base );
         try {                      
             load(filename);
             console.log('loaded %s', filename);
diff --git a/dist/env.rhino.js b/dist/env.rhino.js
index f5cf0962..cecc1ab4 100644
--- a/dist/env.rhino.js
+++ b/dist/env.rhino.js
@@ -123,6 +123,7 @@ Envjs.loadLocalScript = function(script){
         src, 
         i, 
         base,
+        filename,
         // SMP: see also the note in html/document.js about script.type
         script_type = script.type === null ? 
             "text/javascript" : script.type;
@@ -163,7 +164,8 @@ Envjs.loadLocalScript = function(script){
             }
         }
         base = "" + script.ownerDocument.location;
-        var filename = Envjs.location(script.src.match(/([^\?#]*)/)[1], base );
+        //filename = Envjs.location(script.src.match(/([^\?#]*)/)[1], base );
+        filename = Envjs.location(script.src, base );
         try {                      
             load(filename);
             console.log('loaded %s', filename);
diff --git a/dist/platform/core.js b/dist/platform/core.js
index e169e558..79c85286 100644
--- a/dist/platform/core.js
+++ b/dist/platform/core.js
@@ -123,6 +123,7 @@ Envjs.loadLocalScript = function(script){
         src, 
         i, 
         base,
+        filename,
         // SMP: see also the note in html/document.js about script.type
         script_type = script.type === null ? 
             "text/javascript" : script.type;
@@ -163,7 +164,8 @@ Envjs.loadLocalScript = function(script){
             }
         }
         base = "" + script.ownerDocument.location;
-        var filename = Envjs.location(script.src.match(/([^\?#]*)/)[1], base );
+        //filename = Envjs.location(script.src.match(/([^\?#]*)/)[1], base );
+        filename = Envjs.location(script.src, base );
         try {                      
             load(filename);
             console.log('loaded %s', filename);
diff --git a/src/env/core/html.js b/src/env/core/html.js
index a15dfa10..eb9521ec 100644
--- a/src/env/core/html.js
+++ b/src/env/core/html.js
@@ -48,6 +48,7 @@ Envjs.loadLocalScript = function(script){
         src, 
         i, 
         base,
+        filename,
         // SMP: see also the note in html/document.js about script.type
         script_type = script.type === null ? 
             "text/javascript" : script.type;
@@ -88,7 +89,8 @@ Envjs.loadLocalScript = function(script){
             }
         }
         base = "" + script.ownerDocument.location;
-        var filename = Envjs.location(script.src.match(/([^\?#]*)/)[1], base );
+        //filename = Envjs.location(script.src.match(/([^\?#]*)/)[1], base );
+        filename = Envjs.location(script.src, base );
         try {                      
             load(filename);
             console.log('loaded %s', filename);