Better handling partial transition cancellations