#68 - support cancellations