Fix to cancellations