Adjusted ControllerGuard appropriately