diff --git a/src/index.js b/src/index.js
index 36b25f1..1b28350 100644
--- a/src/index.js
+++ b/src/index.js
@@ -41,7 +41,8 @@ export default function mitt(all) {
 		 *	@memberof mitt
 		 */
 		emit(type, event) {
-			list('*').concat(list(type)).forEach( f => { f(event); });
+      list('*').forEach(f => f(type, event));
+      list(type).forEach(f => f(event));
 		}
 	};
 }
diff --git a/test/index.js b/test/index.js
index 8055544..9113bb4 100644
--- a/test/index.js
+++ b/test/index.js
@@ -136,9 +136,12 @@ describe('mitt', () => {
 				inst.emit('foo', event);
 				inst.emit('bar', event);
 
-				expect(star)
-					.to.have.been.calledTwice
-					.and.always.calledWithExactly(event);
+        let args1 = star.args[0],
+					args2 = star.args[1];
+
+				expect(star).to.have.been.calledTwice;
+				expect(args1).to.deep.equal(['foo', event]);
+				expect(args2).to.deep.equal(['bar', event]);
 			});
 		});
 	});