removed Router.current()