Fix issue #1431 (Tx and NoTx used concurrently)