Fixed flow cancellation issue