diff --git a/bower.json b/bower.json
index 40ca3ee8..16d0abdd 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-templating",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "An extensible HTML templating engine supporting databinding, custom elements, attached behaviors and more.",
   "keywords": [
     "aurelia",
diff --git a/dist/amd/resource-coordinator.js b/dist/amd/resource-coordinator.js
index 05a65651..5f25a900 100644
--- a/dist/amd/resource-coordinator.js
+++ b/dist/amd/resource-coordinator.js
@@ -279,10 +279,12 @@ define(["exports", "aurelia-loader", "aurelia-path", "aurelia-dependency-injecti
         org = Origin.get(element.value);
       } else if (resources.length) {
         org = Origin.get(resources[0].value);
+      } else {
+        org = Origin.get(source);
       }
 
       if (org) {
-        this.id = org.id;
+        this.id = org.moduleId;
       }
     }
 
diff --git a/dist/commonjs/resource-coordinator.js b/dist/commonjs/resource-coordinator.js
index 0c64a6ed..4dda207a 100644
--- a/dist/commonjs/resource-coordinator.js
+++ b/dist/commonjs/resource-coordinator.js
@@ -278,10 +278,12 @@ var ResourceModule = (function () {
       org = Origin.get(element.value);
     } else if (resources.length) {
       org = Origin.get(resources[0].value);
+    } else {
+      org = Origin.get(source);
     }
 
     if (org) {
-      this.id = org.id;
+      this.id = org.moduleId;
     }
   }
 
diff --git a/dist/es6/resource-coordinator.js b/dist/es6/resource-coordinator.js
index aeaa79f0..30220d8f 100644
--- a/dist/es6/resource-coordinator.js
+++ b/dist/es6/resource-coordinator.js
@@ -199,10 +199,12 @@ class ResourceModule {
       org = Origin.get(element.value);
     }else if(resources.length){
       org = Origin.get(resources[0].value);
+    }else{
+      org = Origin.get(source);
     }
 
     if(org){
-      this.id = org.id;
+      this.id = org.moduleId;
     }
   }
 
diff --git a/dist/system/resource-coordinator.js b/dist/system/resource-coordinator.js
index 6823ffd7..6c235f43 100644
--- a/dist/system/resource-coordinator.js
+++ b/dist/system/resource-coordinator.js
@@ -356,10 +356,12 @@ System.register(["aurelia-loader", "aurelia-path", "aurelia-dependency-injection
             org = Origin.get(element.value);
           } else if (resources.length) {
             org = Origin.get(resources[0].value);
+          } else {
+            org = Origin.get(source);
           }
 
           if (org) {
-            this.id = org.id;
+            this.id = org.moduleId;
           }
         }
 
diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
index f67ad3a2..078eb3df 100644
--- a/doc/CHANGELOG.md
+++ b/doc/CHANGELOG.md
@@ -1,3 +1,11 @@
+### 0.8.1 (2015-01-23)
+
+
+#### Bug Fixes
+
+* **resource-coordinator:** incorrectly setting analyzed module ids ([7fa47357](http://github.com/aurelia/templating/commit/7fa47357408aedca21eb882a89c3bf8e43560e7b))
+
+
 ## 0.8.0 (2015-01-22)
 
 
diff --git a/package.json b/package.json
index b0b8f132..ea2b4390 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-templating",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "An extensible HTML templating engine supporting databinding, custom elements, attached behaviors and more.",
   "keywords": [
     "aurelia",