Bugfix for router.