diff --git a/mithril.js b/mithril.js
index 1493aa46..89ab1ba8 100644
--- a/mithril.js
+++ b/mithril.js
@@ -1101,7 +1101,7 @@ var _20 = function($window, redrawService0) {
 			current.component = component
 			current.path = path
 			current.resolve = null
-			redrawService0.render(root, current.render(Vnode(component, undefined, params)))
+			redrawService0.render(root, current.render.call(resolver, Vnode(component, undefined, params)))
 		}
 		var run1 = routeService.defineRoutes(routes, function(component, params, path, route, isAction) {
 			if (component.view) render1({}, component, params, path)
@@ -1113,7 +1113,7 @@ var _20 = function($window, redrawService0) {
 							render1(component, resolved, params, path)
 						}
 						component.onmatch(function(resolved) {
-							if (current.path !== path && current.resolve != null) current.resolve(resolved)
+							if (current.resolve != null) current.resolve(resolved)
 						}, params, path)
 					}
 				}
diff --git a/mithril.min.js b/mithril.min.js
index a218474f..6fd0a979 100644
--- a/mithril.min.js
+++ b/mithril.min.js
@@ -36,6 +36,6 @@ var m=k.split(/\]\[?|\[/),t=c;-1<k.indexOf("[")&&m.pop();for(var n=0;n<m.length;
 b,c){var d=a.indexOf("?"),f=a.indexOf("#"),h=-1<d?d:-1<f?f:a.length;if(-1<d){var d=K(a.slice(d+1,-1<f?f:a.length)),g;for(g in d)b[g]=d[g]}if(-1<f)for(g in b=K(a.slice(f+1)),b)c[g]=b[g];return a.slice(0,h)}function d(){switch(n.charAt(0)){case "#":return c("hash").slice(n.length);case "?":return c("search").slice(n.length)+c("hash");default:return c("pathname").slice(n.length)+c("search")+c("hash")}}function k(c,b,d){var g={},h={};c=f(c,g,h);if(null!=b){for(var k in b)g[k]=b[k];c=c.replace(/:([^\/]+)/g,
 function(a,c){delete g[c];return b[c]})}(k=F(g))&&(c+="?"+k);(h=F(h))&&(c+="#"+h);m?(d&&d.replace?a.history.replaceState(null,null,n+c):a.history.pushState(null,null,n+c),a.onpopstate(!0)):a.location.href=n+c}var m="function"===typeof a.history.pushState,t="function"===typeof setImmediate?setImmediate:setTimeout,n="#!",u;return{setPrefix:function(a){n=a},getPath:d,setPath:k,defineRoutes:function(c,b,k){function h(a){var g=d(),h={},m=f(g,h,h),n;for(n in c){var r=new RegExp("^"+n.replace(/:[^\/]+?\.{3}/g,
 "(.*?)").replace(/:[^\/]+/g,"([^\\/]+)")+"/?$");if(r.test(m)){m.replace(r,function(){for(var d=n.match(/:[^\/]+/g)||[],f=[].slice.call(arguments,1,-2),k=0;k<d.length;k++)h[d[k].replace(/:|\./g,"")]=decodeURIComponent(f[k]);b(c[n],h,g,n,!!a)});return}}k(g,h)}m?a.onpopstate=g(h):"#"===n.charAt(0)&&(a.onhashchange=h);h(!0);return h},link:function(a){a.dom.setAttribute("href",n+a.attrs.href);a.dom.onclick=function(a){a.ctrlKey||a.metaKey||a.shiftKey||2===a.which||(a.preventDefault(),a.redraw=!1,a=this.getAttribute("href"),
-0===a.indexOf(n)&&(a=a.slice(n.length)),k(a,void 0,void 0))}}}};A.route=function(a,c){var g=P(a),f=function(a){return a},d={render:f,component:null,path:null,resolve:null},k=function(a,k,n){if(null==a)throw Error("Ensure the DOM element that was passed to `m.route` is not undefined");var m=function(g,b,k,m){d.render=g.render||f;d.component=b;d.path=m;d.resolve=null;c.render(a,d.render(t(b,void 0,k)))};n=g.defineRoutes(n,function(a,b,c,f,g){a.view?m({},a,b,c):a.onmatch?!1===g&&d.path===c||null!=d.resolve?
-m(d,d.component,b):(d.resolve=function(d){m(a,d,b,c)},a.onmatch(function(a){d.path!==c&&null!=d.resolve&&d.resolve(a)},b,c)):m(a,"div",b,c)},function(){g.setPath(k)});c.subscribe(a,n)};k.set=g.setPath;k.get=function(){return d.path};k.prefix=g.setPrefix;k.link=g.link;return k}(window,E);A.withAttr=function(a,c,g){return function(f){return c.call(g||this,a in f.currentTarget?f.currentTarget[a]:f.currentTarget.getAttribute(a))}};var Q=M(window);A.render=Q.render;A.redraw=E.redraw;A.request=J.request;
+0===a.indexOf(n)&&(a=a.slice(n.length)),k(a,void 0,void 0))}}}};A.route=function(a,c){var g=P(a),f=function(a){return a},d={render:f,component:null,path:null,resolve:null},k=function(a,k,n){if(null==a)throw Error("Ensure the DOM element that was passed to `m.route` is not undefined");var m=function(g,b,k,m){d.render=g.render||f;d.component=b;d.path=m;d.resolve=null;c.render(a,d.render.call(g,t(b,void 0,k)))};n=g.defineRoutes(n,function(a,b,c,f,g){a.view?m({},a,b,c):a.onmatch?!1===g&&d.path===c||null!=
+d.resolve?m(d,d.component,b):(d.resolve=function(d){m(a,d,b,c)},a.onmatch(function(a){null!=d.resolve&&d.resolve(a)},b,c)):m(a,"div",b,c)},function(){g.setPath(k)});c.subscribe(a,n)};k.set=g.setPath;k.get=function(){return d.path};k.prefix=g.setPrefix;k.link=g.link;return k}(window,E);A.withAttr=function(a,c,g){return function(f){return c.call(g||this,a in f.currentTarget?f.currentTarget[a]:f.currentTarget.getAttribute(a))}};var Q=M(window);A.render=Q.render;A.redraw=E.redraw;A.request=J.request;
 A.jsonp=J.jsonp;A.parseQueryString=K;A.buildQueryString=F;A.version="1.0.0-rc.6";"undefined"!==typeof module?module.exports=A:window.m=A};
\ No newline at end of file