diff --git a/client/src/main/kotlin/com/r3corda/client/mock/EventGenerator.kt b/client/src/main/kotlin/com/r3corda/client/mock/EventGenerator.kt
index d3521cd78b..3a3a88fcab 100644
--- a/client/src/main/kotlin/com/r3corda/client/mock/EventGenerator.kt
+++ b/client/src/main/kotlin/com/r3corda/client/mock/EventGenerator.kt
@@ -34,13 +34,10 @@ class EventGenerator(
     val partyGenerator = Generator.oneOf(parties)
 
     val cashStateGenerator = amountIssuedGenerator.combine(publicKeyGenerator) { amount, from ->
-        ledger {
-            transaction {
-                output("state", Cash.State(amount, from))
-                command(amount.token.issuer.party.owningKey, Cash.Commands.Issue())
-                verifies()
-            }
-        }.retrieveOutputStateAndRef(Cash.State::class.java, "state")
+        val builder = TransactionBuilder()
+        builder.addOutputState(Cash.State(amount, from))
+        builder.addCommand(Command(Cash.Commands.Issue(), amount.token.issuer.party.owningKey))
+        builder.toWireTransaction().outRef<Cash.State>(0)
     }
 
     val consumedGenerator: Generator<Set<StateRef>> = Generator.frequency(