[core] Make sure end of trigger is before end of run

[core] Make sure end of trigger is before end of run #1545