diff --git a/lib/undefsafe.js b/lib/undefsafe.js
index 52db639..0cfb5fd 100644
--- a/lib/undefsafe.js
+++ b/lib/undefsafe.js
@@ -1,6 +1,6 @@
 'use strict';
 
-function undefsafe(obj, path, value) {
+function undefsafe(obj, path, value, __res) {
 
   // I'm not super keen on this private function, but it's because
   // it'll also be use in the browser and I wont *one* function exposed
@@ -69,17 +69,26 @@ function undefsafe(obj, path, value) {
     if (key === '*') {
       // loop through each property
       var prop = '';
+      var res = __res || [];
 
       for (prop in parent) {
-        var shallowObj = undefsafe(obj[prop], parts.slice(i + 1).join('.'), value);
-        if (shallowObj) {
-          if ((value && shallowObj === value) || (!value)) {
-            return shallowObj;
+        var shallowObj = undefsafe(obj[prop], parts.slice(i + 1).join('.'), value, res);
+        if (shallowObj && shallowObj !== res) {
+          if ((value && shallowObj === value) || (value === undefined)) {
+            if (value !== undefined) {
+              return shallowObj;
+            }
+
+            res.push(shallowObj);
           }
         }
       }
-      return undefined;
-      key = prop;
+
+      if (res.length === 0) {
+        return undefined;
+      }
+
+      return res;
     }
 
     obj = obj[key];
diff --git a/test/star-rule.test.js b/test/star-rule.test.js
index 3b6dc45..a485a0c 100644
--- a/test/star-rule.test.js
+++ b/test/star-rule.test.js
@@ -18,9 +18,23 @@ var fixture = {
   ]
 };
 
+test('2.0.0: match all.*', function (t) {
+  var res = undefsafe(fixture, '*.*.*.1');
+  t.deepEqual(res, ['two', 'four']);
+  t.end();
+});
+
+
+test('2.0.0: match all.*', function (t) {
+  var res = undefsafe(fixture, 'commits.*.modified.*.b');
+  t.deepEqual(res, ['one', 'two', 'two', 'four']);
+  t.end();
+});
+
+
 test('get value on first * selector', function (t) {
-  var res = undefsafe(fixture, 'commits.*.modified.*');
-  t.equal(res, 'one');
+  var res = undefsafe(fixture, 'commits.*.modified.0');
+  t.deepEqual(res, ['one', 'two']);
   t.end();
 });
 
@@ -44,7 +58,7 @@ test('match * selector returns undefined', function (t) {
 });
 
 test('match * selector works on objects', function (t) {
-  var res = undefsafe(fixture, '*.*.modified.*');
+  var res = undefsafe(fixture, '*.*.modified.*', 'one');
   t.equal(res, 'one');
   t.end();
 });