Fix go_router