Fixing RouteHelper