Fixed tx was removed during merge