Cancellation bug fixed