fixed cancellation issues