router.go() fixes