diff --git a/dist/sea-debug.js b/dist/sea-debug.js
index 097bdcdc..f7f21f89 100644
--- a/dist/sea-debug.js
+++ b/dist/sea-debug.js
@@ -929,9 +929,12 @@ seajs._config = {
     if (resolvedUri) {
       // If the first module in a package is not the cachedModules[derivedUri]
       // self, it should assign it to the correct module when found.
-      if (resolvedUri === derivedUri &&
-          (cachedModules[derivedUri] || {}).status === STATUS.SAVED) {
-        cachedModules[derivedUri] = null
+      if (resolvedUri === derivedUri) {
+        var refModule = cachedModules[derivedUri]
+        if (refModule && refModule.packageUri &&
+            refModule.status === STATUS.SAVED) {
+          cachedModules[derivedUri] = null
+        }
       }
 
       var module = save(resolvedUri, meta)
@@ -941,6 +944,7 @@ seajs._config = {
         // cachedModules[derivedUri] may be undefined in combo case.
         if ((cachedModules[derivedUri] || {}).status === STATUS.FETCHING) {
           cachedModules[derivedUri] = module
+          module.packageUri = derivedUri
         }
       }
       else {
@@ -1066,6 +1070,7 @@ seajs._config = {
           // See: test/issues/un-correspondence
           if (firstModuleInPackage && module.status === STATUS.FETCHED) {
             cachedModules[uri] = firstModuleInPackage
+            firstModuleInPackage.packageUri = uri
           }
           firstModuleInPackage = null
 
diff --git a/dist/sea.js b/dist/sea.js
index e7414d7c..8abacffa 100644
--- a/dist/sea.js
+++ b/dist/sea.js
@@ -6,24 +6,24 @@ this.seajs={_seajs:this.seajs};seajs.version="1.2.0";seajs._util={};seajs._confi
 (function(a){var c=Object.prototype.toString,d=Array.prototype;a.isString=function(a){return"[object String]"===c.call(a)};a.isFunction=function(a){return"[object Function]"===c.call(a)};a.isRegExp=function(a){return"[object RegExp]"===c.call(a)};a.isObject=function(a){return a===Object(a)};a.isArray=Array.isArray||function(a){return"[object Array]"===c.call(a)};a.indexOf=d.indexOf?function(a,c){return a.indexOf(c)}:function(a,c){for(var b=0;b<a.length;b++)if(a[b]===c)return b;return-1};var b=a.forEach=
 d.forEach?function(a,c){a.forEach(c)}:function(a,c){for(var b=0;b<a.length;b++)c(a[b],b,a)};a.map=d.map?function(a,c){return a.map(c)}:function(a,c){var d=[];b(a,function(a,b,e){d.push(c(a,b,e))});return d};a.filter=d.filter?function(a,c){return a.filter(c)}:function(a,c){var d=[];b(a,function(a,b,e){c(a,b,e)&&d.push(a)});return d};a.unique=function(a){var c=[],d={};b(a,function(a){d[a]=1});if(Object.keys)c=Object.keys(d);else for(var i in d)d.hasOwnProperty(i)&&c.push(i);return c};a.keys=Object.keys;
 a.keys||(a.keys=function(a){var c=[],b;for(b in a)a.hasOwnProperty(b)&&c.push(b);return c});a.now=Date.now||function(){return(new Date).getTime()}})(seajs._util);(function(a,c){var d=Array.prototype;a.log=function(){if("undefined"!==typeof console){var a=d.slice.call(arguments),e="log";console[a[a.length-1]]&&(e=a.pop());if("log"!==e||c.debug)a="dir"===e?a[0]:d.join.call(a," "),console[e](a)}}})(seajs._util,seajs._config);
-(function(a,c,d){function b(a){a=a.match(r);return(a?a[0]:".")+"/"}function e(a){l.lastIndex=0;l.test(a)&&(a=a.replace(l,"$1/"));if(-1===a.indexOf("."))return a;for(var c=a.split("/"),b=[],d,f=0;f<c.length;f++)if(d=c[f],".."===d){if(0===b.length)throw Error("The path is invalid: "+a);b.pop()}else"."!==d&&b.push(d);return b.join("/")}function o(a){var a=e(a),c=a.charAt(a.length-1);if("/"===c)return a;"#"===c?a=a.slice(0,-1):-1===a.indexOf("?")&&!h.test(a)&&(a+=".js");return a}function k(a){if("#"===
-a.charAt(0))return a.substring(1);var b=c.alias;if(b&&j(a)){var d=a.split("/"),f=d[0];b.hasOwnProperty(f)&&(d[0]=b[f],a=d.join("/"))}return a}function i(a){return 0<a.indexOf("://")||0===a.indexOf("//")}function j(a){var c=a.charAt(0);return-1===a.indexOf("://")&&"."!==c&&"/"!==c}var r=/.*(?=\/.*$)/,l=/([^:\/])\/\/+/g,h=/\.(?:css|js)$/,n=/^(.*?\w)(?:\/|$)/,g={},d=d.location,f=d.protocol+"//"+d.host+function(a){"/"!==a.charAt(0)&&(a="/"+a);return a}(d.pathname);0<f.indexOf("\\")&&(f=f.replace(/\\/g,
-"/"));a.dirname=b;a.realpath=e;a.normalize=o;a.parseAlias=k;a.parseMap=function(b){var d=c.map||[];if(!d.length)return b;for(var f=b,h=0;h<d.length;h++){var e=d[h];if(a.isArray(e)&&2===e.length){var i=e[0];if(a.isString(i)&&-1<f.indexOf(i)||a.isRegExp(i)&&i.test(f))f=f.replace(i,e[1])}else a.isFunction(e)&&(f=e(f))}f!==b&&(g[f]=b);return f};a.unParseMap=function(a){return g[a]||a};a.id2Uri=function(a,d){a=k(a);d||(d=f);var e;i(a)?e=a:0===a.indexOf("./")||0===a.indexOf("../")?(0===a.indexOf("./")&&
+(function(a,c,d){function b(a){a=a.match(s);return(a?a[0]:".")+"/"}function e(a){k.lastIndex=0;k.test(a)&&(a=a.replace(k,"$1/"));if(-1===a.indexOf("."))return a;for(var c=a.split("/"),b=[],d,f=0;f<c.length;f++)if(d=c[f],".."===d){if(0===b.length)throw Error("The path is invalid: "+a);b.pop()}else"."!==d&&b.push(d);return b.join("/")}function o(a){var a=e(a),c=a.charAt(a.length-1);if("/"===c)return a;"#"===c?a=a.slice(0,-1):-1===a.indexOf("?")&&!h.test(a)&&(a+=".js");return a}function l(a){if("#"===
+a.charAt(0))return a.substring(1);var b=c.alias;if(b&&j(a)){var d=a.split("/"),f=d[0];b.hasOwnProperty(f)&&(d[0]=b[f],a=d.join("/"))}return a}function i(a){return 0<a.indexOf("://")||0===a.indexOf("//")}function j(a){var c=a.charAt(0);return-1===a.indexOf("://")&&"."!==c&&"/"!==c}var s=/.*(?=\/.*$)/,k=/([^:\/])\/\/+/g,h=/\.(?:css|js)$/,n=/^(.*?\w)(?:\/|$)/,g={},d=d.location,f=d.protocol+"//"+d.host+function(a){"/"!==a.charAt(0)&&(a="/"+a);return a}(d.pathname);0<f.indexOf("\\")&&(f=f.replace(/\\/g,
+"/"));a.dirname=b;a.realpath=e;a.normalize=o;a.parseAlias=l;a.parseMap=function(b){var d=c.map||[];if(!d.length)return b;for(var f=b,h=0;h<d.length;h++){var e=d[h];if(a.isArray(e)&&2===e.length){var i=e[0];if(a.isString(i)&&-1<f.indexOf(i)||a.isRegExp(i)&&i.test(f))f=f.replace(i,e[1])}else a.isFunction(e)&&(f=e(f))}f!==b&&(g[f]=b);return f};a.unParseMap=function(a){return g[a]||a};a.id2Uri=function(a,d){a=l(a);d||(d=f);var e;i(a)?e=a:0===a.indexOf("./")||0===a.indexOf("../")?(0===a.indexOf("./")&&
 (a=a.substring(2)),e=b(d)+a):e="/"===a.charAt(0)&&"/"!==a.charAt(1)?d.match(n)[1]+a:c.base+"/"+a;return o(e)};a.isAbsolute=i;a.isTopLevel=j;a.pageUri=f})(seajs._util,seajs._config,this);
-(function(a,c){function d(a,b){a.onload=a.onerror=a.onreadystatechange=function(){l.test(a.readyState)&&(a.onload=a.onerror=a.onreadystatechange=null,a.parentNode&&!c.debug&&i.removeChild(a),a=void 0,b())}}function b(c,b){f||p?(a.log("Start poll to fetch css"),setTimeout(function(){e(c,b)},1)):c.onload=c.onerror=function(){c.onload=c.onerror=null;c=void 0;b()}}function e(a,c){var b;if(f)a.sheet&&(b=!0);else if(a.sheet)try{a.sheet.cssRules&&(b=!0)}catch(d){"NS_ERROR_DOM_SECURITY_ERR"===d.name&&(b=
-!0)}setTimeout(function(){b?c():e(a,c)},1)}function o(){}var k=document,i=k.head||k.getElementsByTagName("head")[0]||k.documentElement,j=i.getElementsByTagName("base")[0],r=/\.css(?:\?|$)/i,l=/loaded|complete|undefined/,h,n;a.fetch=function(c,f,e){var l=r.test(c),g=document.createElement(l?"link":"script");e&&(e=a.isFunction(e)?e(c):e)&&(g.charset=e);f=f||o;"SCRIPT"===g.nodeName?d(g,f):b(g,f);l?(g.rel="stylesheet",g.href=c):(g.async="async",g.src=c);h=g;j?i.insertBefore(g,j):i.appendChild(g);h=null};
-a.getCurrentScript=function(){if(h)return h;if(n&&"interactive"===n.readyState)return n;for(var a=i.getElementsByTagName("script"),c=0;c<a.length;c++){var b=a[c];if("interactive"===b.readyState)return n=b}};a.getScriptAbsoluteSrc=function(a){return a.hasAttribute?a.src:a.getAttribute("src",4)};a.importStyle=function(a,c){if(!c||!k.getElementById(c)){var b=k.createElement("style");c&&(b.id=c);i.appendChild(b);b.styleSheet?b.styleSheet.cssText=a:b.appendChild(k.createTextNode(a))}};var g=navigator.userAgent,
+(function(a,c){function d(a,b){a.onload=a.onerror=a.onreadystatechange=function(){k.test(a.readyState)&&(a.onload=a.onerror=a.onreadystatechange=null,a.parentNode&&!c.debug&&i.removeChild(a),a=void 0,b())}}function b(c,b){f||p?(a.log("Start poll to fetch css"),setTimeout(function(){e(c,b)},1)):c.onload=c.onerror=function(){c.onload=c.onerror=null;c=void 0;b()}}function e(a,c){var b;if(f)a.sheet&&(b=!0);else if(a.sheet)try{a.sheet.cssRules&&(b=!0)}catch(d){"NS_ERROR_DOM_SECURITY_ERR"===d.name&&(b=
+!0)}setTimeout(function(){b?c():e(a,c)},1)}function o(){}var l=document,i=l.head||l.getElementsByTagName("head")[0]||l.documentElement,j=i.getElementsByTagName("base")[0],s=/\.css(?:\?|$)/i,k=/loaded|complete|undefined/,h,n;a.fetch=function(c,f,e){var k=s.test(c),g=document.createElement(k?"link":"script");e&&(e=a.isFunction(e)?e(c):e)&&(g.charset=e);f=f||o;"SCRIPT"===g.nodeName?d(g,f):b(g,f);k?(g.rel="stylesheet",g.href=c):(g.async="async",g.src=c);h=g;j?i.insertBefore(g,j):i.appendChild(g);h=null};
+a.getCurrentScript=function(){if(h)return h;if(n&&"interactive"===n.readyState)return n;for(var a=i.getElementsByTagName("script"),c=0;c<a.length;c++){var b=a[c];if("interactive"===b.readyState)return n=b}};a.getScriptAbsoluteSrc=function(a){return a.hasAttribute?a.src:a.getAttribute("src",4)};a.importStyle=function(a,c){if(!c||!l.getElementById(c)){var b=l.createElement("style");c&&(b.id=c);i.appendChild(b);b.styleSheet?b.styleSheet.cssText=a:b.appendChild(l.createTextNode(a))}};var g=navigator.userAgent,
 f=536>Number(g.replace(/.*AppleWebKit\/(\d+)\..*/,"$1")),p=0<g.indexOf("Firefox")&&!("onload"in document.createElement("link"))})(seajs._util,seajs._config,this);(function(a){var c=/(?:^|[^.$])\brequire\s*\(\s*(["'])([^"'\s\)]+)\1\s*\)/g;a.parseDependencies=function(d){var b=[],e,d=d.replace(/^\s*\/\*[\s\S]*?\*\/\s*$/mg,"").replace(/^\s*\/\/.*$/mg,"");for(c.lastIndex=0;e=c.exec(d);)e[2]&&b.push(e[2]);return a.unique(b)}})(seajs._util);
-(function(a,c,d){function b(a,c){this.uri=a;this.status=c||0}function e(a,d){return c.isString(a)?b._resolve(a,d):c.map(a,function(a){return e(a,d)})}function o(a,q){var m=c.parseMap(a);x[m]?q():p[m]?s[m].push(q):(p[m]=!0,s[m]=[q],b._fetch(m,function(){x[m]=!0;var b=h[a];b.status===f.FETCHING&&(b.status=f.FETCHED);u&&(k(a,u),u=null);t&&b.status===f.FETCHED&&(h[a]=t);t=null;p[m]&&delete p[m];s[m]&&(c.forEach(s[m],function(a){a()}),delete s[m])},d.charset))}function k(a,d){var m=h[a]||(h[a]=new b(a));
-m.status<f.SAVED&&(m.id=d.id||a,m.dependencies=e(c.filter(d.dependencies||[],function(a){return!!a}),a),m.factory=d.factory,m.status=f.SAVED);return m}function i(a,c){var b=a(c.require,c.exports,c);void 0!==b&&(c.exports=b)}function j(a){var b=a.uri,d=n[b];d&&(c.forEach(d,function(c){i(c,a)}),delete n[b])}function r(a){var b=a.uri;return c.filter(a.dependencies,function(a){v=[b];if(a=l(h[a],b))v.push(b),c.log("Found circular dependencies:",v.join(" --\> "),void 0);return!a})}function l(a,b){if(!a||
-a.status!==f.SAVED)return!1;v.push(a.uri);var d=a.dependencies;if(d.length){if(-1<c.indexOf(d,b))return!0;for(var e=0;e<d.length;e++)if(l(h[d[e]],b))return!0}return!1}var h={},n={},g=[],f={FETCHING:1,FETCHED:2,SAVED:3,READY:4,COMPILING:5,COMPILED:6};b.prototype._use=function(a,b){c.isString(a)&&(a=[a]);var d=e(a,this.uri);this._load(d,function(){var a=c.map(d,function(a){return h[a]._compile()});b&&b.apply(null,a)})};b.prototype._load=function(a,d){function e(a){a&&(a.status=f.READY);0===--g&&d()}
-var y=c.filter(a,function(a){return a&&(!h[a]||h[a].status<f.READY)}),i=y.length;if(0===i)d();else for(var g=i,j=0;j<i;j++)(function(a){function c(){d=h[a];if(d.status>=f.SAVED){var q=r(d);q.length?b.prototype._load(q,function(){e(d)}):e(d)}else e()}var d=h[a]||(h[a]=new b(a,f.FETCHING));d.status>=f.FETCHED?c():o(a,c)})(y[j])};b.prototype._compile=function(){function a(c){c=e(c,b.uri);c=h[c];if(!c)return null;if(c.status===f.COMPILING)return c.exports;c.parent=b;return c._compile()}var b=this;if(b.status===
-f.COMPILED)return b.exports;if(b.status<f.READY)return null;b.status=f.COMPILING;a.async=function(a,c){b._use(a,c)};a.resolve=function(a){return e(a,b.uri)};a.cache=h;b.require=a;b.exports={};var d=b.factory;c.isFunction(d)?(g.push(b),i(d,b),g.pop()):void 0!==d&&(b.exports=d);b.status=f.COMPILED;j(b);return b.exports};b._define=function(a,b,d){var i=arguments.length;1===i?(d=a,a=void 0):2===i&&(d=b,b=void 0,c.isArray(a)&&(b=a,a=void 0));!c.isArray(b)&&c.isFunction(d)&&(b=c.parseDependencies(d.toString()));
-var i={id:a,dependencies:b,factory:d},g;if(document.attachEvent){var j=c.getCurrentScript();j&&(g=c.unParseMap(c.getScriptAbsoluteSrc(j)));g||c.log("Failed to derive URI from interactive script for:",d.toString(),"warn")}if(j=a?e(a):g){if(j===g&&(h[g]||{}).status===f.SAVED)h[g]=null;i=k(j,i);if(g){if((h[g]||{}).status===f.FETCHING)h[g]=i}else t||(t=i)}else u=i};b._getCompilingModule=function(){return g[g.length-1]};b._find=function(a){var b=[];c.forEach(c.keys(h),function(d){if(c.isString(a)&&-1<
-d.indexOf(a)||c.isRegExp(a)&&a.test(d))d=h[d],d.exports&&b.push(d.exports)});var d=b.length;1===d?b=b[0]:0===d&&(b=null);return b};b._modify=function(b,c){var d=e(b),g=h[d];g&&g.status===f.COMPILED?i(c,g):(n[d]||(n[d]=[]),n[d].push(c));return a};b.STATUS=f;b._resolve=c.id2Uri;b._fetch=c.fetch;b.cache=h;var p={},x={},s={},u=null,t=null,v=[],w=new b(c.pageUri,f.COMPILED);a.use=function(c,b){var e=d.preload;e.length?w._use(e,function(){d.preload=[];w._use(c,b)}):w._use(c,b);return a};a.define=b._define;
-a.cache=b.cache;a.find=b._find;a.modify=b._modify;a.pluginSDK={Module:b,util:c,config:d}})(seajs,seajs._util,seajs._config);
-(function(a,c,d){var b="seajs-ts="+c.now(),e=document.getElementById("seajsnode");e||(e=document.getElementsByTagName("script"),e=e[e.length-1]);var o=c.getScriptAbsoluteSrc(e)||c.pageUri,o=c.dirname(function(a){if(a.indexOf("??")===-1)return a;var b=a.split("??"),a=b[0],b=c.filter(b[1].split(","),function(a){return a.indexOf("sea.js")!==-1});return a+b[0]}(o));c.loaderDir=o;var k=o.match(/^(.+\/)seajs\/[\d\.]+\/$/);k&&(o=k[1]);d.base=o;if(e=e.getAttribute("data-main"))d.main=e;d.charset="utf-8";
-a.config=function(e){for(var j in e)if(e.hasOwnProperty(j)){var k=d[j],l=e[j];if(k&&j==="alias")for(var h in l){if(l.hasOwnProperty(h)){var n=k[h],g=l[h];/^\d+\.\d+\.\d+$/.test(g)&&(g=h+"/"+g+"/"+h);n&&n!==g&&c.log("The alias config is conflicted:","key =",'"'+h+'"',"previous =",'"'+n+'"',"current =",'"'+g+'"',"warn");k[h]=g}}else if(k&&(j==="map"||j==="preload")){c.isString(l)&&(l=[l]);c.forEach(l,function(a){a&&k.push(a)})}else d[j]=l}if((e=d.base)&&!c.isAbsolute(e))d.base=c.id2Uri("./"+e+"/");
+(function(a,c,d){function b(a,c){this.uri=a;this.status=c||0}function e(a,d){return c.isString(a)?b._resolve(a,d):c.map(a,function(a){return e(a,d)})}function o(a,r){var m=c.parseMap(a);x[m]?r():p[m]?t[m].push(r):(p[m]=!0,t[m]=[r],b._fetch(m,function(){x[m]=!0;var b=h[a];b.status===f.FETCHING&&(b.status=f.FETCHED);u&&(l(a,u),u=null);q&&b.status===f.FETCHED&&(h[a]=q,q.packageUri=a);q=null;p[m]&&delete p[m];t[m]&&(c.forEach(t[m],function(a){a()}),delete t[m])},d.charset))}function l(a,d){var m=h[a]||
+(h[a]=new b(a));m.status<f.SAVED&&(m.id=d.id||a,m.dependencies=e(c.filter(d.dependencies||[],function(a){return!!a}),a),m.factory=d.factory,m.status=f.SAVED);return m}function i(a,c){var b=a(c.require,c.exports,c);void 0!==b&&(c.exports=b)}function j(a){var b=a.uri,d=n[b];d&&(c.forEach(d,function(c){i(c,a)}),delete n[b])}function s(a){var b=a.uri;return c.filter(a.dependencies,function(a){v=[b];if(a=k(h[a],b))v.push(b),c.log("Found circular dependencies:",v.join(" --\> "),void 0);return!a})}function k(a,
+b){if(!a||a.status!==f.SAVED)return!1;v.push(a.uri);var d=a.dependencies;if(d.length){if(-1<c.indexOf(d,b))return!0;for(var e=0;e<d.length;e++)if(k(h[d[e]],b))return!0}return!1}var h={},n={},g=[],f={FETCHING:1,FETCHED:2,SAVED:3,READY:4,COMPILING:5,COMPILED:6};b.prototype._use=function(a,b){c.isString(a)&&(a=[a]);var d=e(a,this.uri);this._load(d,function(){var a=c.map(d,function(a){return h[a]._compile()});b&&b.apply(null,a)})};b.prototype._load=function(a,d){function e(a){a&&(a.status=f.READY);0===
+--g&&d()}var y=c.filter(a,function(a){return a&&(!h[a]||h[a].status<f.READY)}),i=y.length;if(0===i)d();else for(var g=i,j=0;j<i;j++)(function(a){function c(){d=h[a];if(d.status>=f.SAVED){var r=s(d);r.length?b.prototype._load(r,function(){e(d)}):e(d)}else e()}var d=h[a]||(h[a]=new b(a,f.FETCHING));d.status>=f.FETCHED?c():o(a,c)})(y[j])};b.prototype._compile=function(){function a(c){c=e(c,b.uri);c=h[c];if(!c)return null;if(c.status===f.COMPILING)return c.exports;c.parent=b;return c._compile()}var b=
+this;if(b.status===f.COMPILED)return b.exports;if(b.status<f.READY)return null;b.status=f.COMPILING;a.async=function(a,c){b._use(a,c)};a.resolve=function(a){return e(a,b.uri)};a.cache=h;b.require=a;b.exports={};var d=b.factory;c.isFunction(d)?(g.push(b),i(d,b),g.pop()):void 0!==d&&(b.exports=d);b.status=f.COMPILED;j(b);return b.exports};b._define=function(a,b,d){var i=arguments.length;1===i?(d=a,a=void 0):2===i&&(d=b,b=void 0,c.isArray(a)&&(b=a,a=void 0));!c.isArray(b)&&c.isFunction(d)&&(b=c.parseDependencies(d.toString()));
+var i={id:a,dependencies:b,factory:d},g;if(document.attachEvent){var j=c.getCurrentScript();j&&(g=c.unParseMap(c.getScriptAbsoluteSrc(j)));g||c.log("Failed to derive URI from interactive script for:",d.toString(),"warn")}if(j=a?e(a):g){if(j===g){var k=h[g];k&&(k.packageUri&&k.status===f.SAVED)&&(h[g]=null)}i=l(j,i);if(g){if((h[g]||{}).status===f.FETCHING)h[g]=i,i.packageUri=g}else q||(q=i)}else u=i};b._getCompilingModule=function(){return g[g.length-1]};b._find=function(a){var b=[];c.forEach(c.keys(h),
+function(d){if(c.isString(a)&&-1<d.indexOf(a)||c.isRegExp(a)&&a.test(d))d=h[d],d.exports&&b.push(d.exports)});var d=b.length;1===d?b=b[0]:0===d&&(b=null);return b};b._modify=function(b,c){var d=e(b),g=h[d];g&&g.status===f.COMPILED?i(c,g):(n[d]||(n[d]=[]),n[d].push(c));return a};b.STATUS=f;b._resolve=c.id2Uri;b._fetch=c.fetch;b.cache=h;var p={},x={},t={},u=null,q=null,v=[],w=new b(c.pageUri,f.COMPILED);a.use=function(c,b){var e=d.preload;e.length?w._use(e,function(){d.preload=[];w._use(c,b)}):w._use(c,
+b);return a};a.define=b._define;a.cache=b.cache;a.find=b._find;a.modify=b._modify;a.pluginSDK={Module:b,util:c,config:d}})(seajs,seajs._util,seajs._config);
+(function(a,c,d){var b="seajs-ts="+c.now(),e=document.getElementById("seajsnode");e||(e=document.getElementsByTagName("script"),e=e[e.length-1]);var o=c.getScriptAbsoluteSrc(e)||c.pageUri,o=c.dirname(function(a){if(a.indexOf("??")===-1)return a;var b=a.split("??"),a=b[0],b=c.filter(b[1].split(","),function(a){return a.indexOf("sea.js")!==-1});return a+b[0]}(o));c.loaderDir=o;var l=o.match(/^(.+\/)seajs\/[\d\.]+\/$/);l&&(o=l[1]);d.base=o;if(e=e.getAttribute("data-main"))d.main=e;d.charset="utf-8";
+a.config=function(e){for(var j in e)if(e.hasOwnProperty(j)){var l=d[j],k=e[j];if(l&&j==="alias")for(var h in k){if(k.hasOwnProperty(h)){var n=l[h],g=k[h];/^\d+\.\d+\.\d+$/.test(g)&&(g=h+"/"+g+"/"+h);n&&n!==g&&c.log("The alias config is conflicted:","key =",'"'+h+'"',"previous =",'"'+n+'"',"current =",'"'+g+'"',"warn");l[h]=g}}else if(l&&(j==="map"||j==="preload")){c.isString(k)&&(k=[k]);c.forEach(k,function(a){a&&l.push(a)})}else d[j]=k}if((e=d.base)&&!c.isAbsolute(e))d.base=c.id2Uri("./"+e+"/");
 if(d.debug===2){d.debug=1;a.config({map:[[/^.*$/,function(a){a.indexOf("seajs-ts=")===-1&&(a=a+((a.indexOf("?")===-1?"?":"&")+b));return a}]]})}if(d.debug)a.debug=!!d.debug;return this};d.debug&&(a.debug=!!d.debug)})(seajs,seajs._util,seajs._config);
 (function(a,c,d){a.log=c.log;a.importStyle=c.importStyle;a.config({alias:{seajs:c.loaderDir}});if(-1<d.location.search.indexOf("seajs-debug")||-1<document.cookie.indexOf("seajs=1"))a.config({debug:2}).use("seajs/plugin-debug"),a._use=a.use,a._useArgs=[],a.use=function(){a._useArgs.push(arguments);return a}})(seajs,seajs._util,this);
 (function(a,c,d){var b=a._seajs;if(b&&!b.args)d.seajs=a._seajs;else{d.define=a.define;c.main&&a.use(c.main);if(c=(b||0).args){d={"0":"config",1:"use",2:"define"};for(b=0;b<c.length;b+=2)a[d[c[b]]].apply(a,c[b+1])}delete a.define;delete a._util;delete a._config;delete a._seajs}})(seajs,seajs._config,this);
diff --git a/src/module.js b/src/module.js
index abbe3ce0..d3cd24f2 100644
--- a/src/module.js
+++ b/src/module.js
@@ -215,9 +215,12 @@
     if (resolvedUri) {
       // If the first module in a package is not the cachedModules[derivedUri]
       // self, it should assign it to the correct module when found.
-      if (resolvedUri === derivedUri &&
-          (cachedModules[derivedUri] || {}).status === STATUS.SAVED) {
-        cachedModules[derivedUri] = null
+      if (resolvedUri === derivedUri) {
+        var refModule = cachedModules[derivedUri]
+        if (refModule && refModule.packageUri &&
+            refModule.status === STATUS.SAVED) {
+          cachedModules[derivedUri] = null
+        }
       }
 
       var module = save(resolvedUri, meta)
@@ -227,6 +230,7 @@
         // cachedModules[derivedUri] may be undefined in combo case.
         if ((cachedModules[derivedUri] || {}).status === STATUS.FETCHING) {
           cachedModules[derivedUri] = module
+          module.packageUri = derivedUri
         }
       }
       else {
@@ -352,6 +356,7 @@
           // See: test/issues/un-correspondence
           if (firstModuleInPackage && module.status === STATUS.FETCHED) {
             cachedModules[uri] = firstModuleInPackage
+            firstModuleInPackage.packageUri = uri
           }
           firstModuleInPackage = null
 
diff --git a/test/issues/define-override/test.html b/test/issues/define-override/test.html
index e4c9927a..526262c2 100644
--- a/test/issues/define-override/test.html
+++ b/test/issues/define-override/test.html
@@ -24,7 +24,7 @@
 <script>
 
   seajs.config({
-    base: './'
+    base: '.'
   });
 
   seajs.use('main');
diff --git a/test/modules/require-async/program.js b/test/modules/require-async/program.js
index fc48fb11..881a809c 100644
--- a/test/modules/require-async/program.js
+++ b/test/modules/require-async/program.js
@@ -1,7 +1,10 @@
 define(function(require) {
 
   var test = require('../../test')
-  var path = 'http://seajs.org/test/modules/require-async/'
+
+  var path = typeof global !== 'undefined' ? // node environment
+      'http://seajs.org/test/modules/require-async/' :
+      './'
 
   require.async(['./a', path + 'b.js', path + 'c.js'], function(a, b, c) {
 
diff --git a/test/runtime/order-no-matter/main.js b/test/runtime/order-no-matter/main.js
index 7330d346..81784937 100644
--- a/test/runtime/order-no-matter/main.js
+++ b/test/runtime/order-no-matter/main.js
@@ -1,3 +1,3 @@
 define("increment",["math"],function(a,b){var c=a("./math").add;b.increment=function(a){return c(a,1)}});
 define("math",[],function(a,b){b.add=function(){var a=0,b=0,c=arguments.length;while(b<c)a+=arguments[b++];return a}});
-define("main",["../../test","increment"],function(a){var b=a("../../test"),c=a("./increment").increment;debugger;b.assert(c(1)===2,"The result of inc(1) is 2."),b.done()});
+define("main",["../../test","increment"],function(a){var b=a("../../test"),c=a("./increment").increment;b.assert(c(1)===2,"The result of inc(1) is 2."),b.done()});
diff --git a/test/vendor.js b/test/vendor.js
index 86816fdf..895b32f2 100644
--- a/test/vendor.js
+++ b/test/vendor.js
@@ -4,7 +4,9 @@
   var MODULES_PATH = 'https://a.alipayobjects.com/static/arale/'
   //var MODULES_PATH = 'http://modules.seajs.org/'
 
-  if (location.href.indexOf('/~lifesinger/') > 0) {
+  var isLocal = location.href.indexOf('/~lifesinger/') > 0
+
+  if (isLocal) {
     MODULES_PATH = 'http://' + location.host + '/~lifesinger/seajs/spm/modules/'
   }
 
@@ -29,6 +31,9 @@
   })
 
 
-  define({ isMobile: isMobile })
+  define({
+    isMobile: isMobile,
+    isLocal: isLocal
+  })
 
 })()