Adding a short-circuit possibility after the trigger