diff --git a/src/lib/dom-module.html b/src/lib/dom-module.html
index b3b438a789..7dd04fee5c 100644
--- a/src/lib/dom-module.html
+++ b/src/lib/dom-module.html
@@ -4,6 +4,9 @@
 
   var modules = {};
   var lcModules = {};
+  var findModule = function(id) {
+    return modules[id] || lcModules[id.toLowerCase()];
+  }
 
   /**
    * The `dom-module` element registers the dom it contains to the name given
@@ -64,13 +67,13 @@
      * at the specified `id`.
      */
     import: function(id, selector) {
-      var m = modules[id] || lcModules[id.toLowerCase()];
+      var m = findModule(id);
       if (!m) {
         // If polyfilling, a script can run before a dom-module element
         // is upgraded. We force the containing document to upgrade
         // and try again to workaround this polyfill limitation.
         forceDocumentUpgrade();
-        m = modules[id];
+        m = findModule(id);
       }
       if (m && selector) {
         m = m.querySelector(selector);
diff --git a/test/unit/dom-module-elements.html b/test/unit/dom-module-elements.html
index cd552e70e3..f9916cf143 100644
--- a/test/unit/dom-module-elements.html
+++ b/test/unit/dom-module-elements.html
@@ -4,4 +4,15 @@
 
 <dom-module id="case">case</dom-module>
 
-<dom-module id="Case">Case</dom-module>
\ No newline at end of file
+<dom-module id="Case">Case</dom-module>
+
+<dom-module id="Test-element">
+  <template>
+      <span id="content">test uppercase</span>
+  </template>
+</dom-module>
+<script>
+  TestElement = Polymer({ 
+    is: 'Test-element'
+  });
+</script>
\ No newline at end of file
diff --git a/test/unit/dom-module.html b/test/unit/dom-module.html
index 19f9f5f1b7..cfab914ad0 100644
--- a/test/unit/dom-module.html
+++ b/test/unit/dom-module.html
@@ -51,6 +51,11 @@
         assert.equal(Polymer.DomModule.import('Case').textContent, 'Case');
       });
 
+      test('mixed case element creation', function() {
+        t = new TestElement();
+        assert.ok(t.$.content);
+      })
+
     });
 
   </script>