fix cancellation