Fix Transaction Bug: Address Comments