Scheduler event trigger fix