Tx deadlock was partially fixed.