Fix Router.map