Fix handler reschedule. Pretty sure these should reschedule after being executed.