Fix cancellation