diff --git a/node/src/main/kotlin/net/corda/node/internal/ServiesForResolutionImpl.kt b/node/src/main/kotlin/net/corda/node/internal/ServicesForResolutionImpl.kt
similarity index 94%
rename from node/src/main/kotlin/net/corda/node/internal/ServiesForResolutionImpl.kt
rename to node/src/main/kotlin/net/corda/node/internal/ServicesForResolutionImpl.kt
index c653a689b0..a21760ce0a 100644
--- a/node/src/main/kotlin/net/corda/node/internal/ServiesForResolutionImpl.kt
+++ b/node/src/main/kotlin/net/corda/node/internal/ServicesForResolutionImpl.kt
@@ -23,10 +23,10 @@ data class ServicesForResolutionImpl(
 
     @Throws(TransactionResolutionException::class)
     override fun loadStates(stateRefs: Set<StateRef>): Set<StateAndRef<ContractState>> {
-        return stateRefs.groupBy { it.txhash }.map {
+        return stateRefs.groupBy { it.txhash }.flatMap {
             val stx = validatedTransactions.getTransaction(it.key) ?: throw TransactionResolutionException(it.key)
             val baseTx = stx.resolveBaseTransaction(this)
             it.value.map { StateAndRef(baseTx.outputs[it.index], it) }
-        }.flatMap { it }.toSet()
+        }.toSet()
     }
 }
\ No newline at end of file