Schedules should now end correctly all the time