Fix issue #1431 (Tx and NoTx used concurrently)
Merge pull request #1435 from scenari/master

 Fix issue #1431 (Tx and NoTx used concurrently)