diff --git a/lib/system.js b/lib/system.js
index 781e37c..81bd106 100644
--- a/lib/system.js
+++ b/lib/system.js
@@ -235,8 +235,10 @@
 
           // exact path match
           if (pathParts.length == 1) {
-            if (name == p && p.length > pathMatch.length)
+            if (name == p && p.length > pathMatch.length) {
               pathMatch = p;
+              break;
+            }
           }
 
           // wildcard path match
diff --git a/test/test.js b/test/test.js
index c55e701..0862867 100644
--- a/test/test.js
+++ b/test/test.js
@@ -388,7 +388,9 @@ function runTests() {
   });
 
   test('Custom path most specific', function(assert) {
+    delete System.paths['bar/*'];
     System.paths['bar/bar'] = 'loader/specific-path.js';
+    System.paths['bar/*'] = 'loader/custom-folder/*.js';
     System['import']('bar/bar').then(function(m) {
       assert(m.path, true);
     });