Fix nested transaction flow