Fixed go_router