Adjusted RouteGuard appropriately