Better preemtion handling