Fix event cancellation