diff --git a/codepropertygraph/src/main/scala/io/shiftleft/codepropertygraph/cpgloading/ProtoCpgLoader.scala b/codepropertygraph/src/main/scala/io/shiftleft/codepropertygraph/cpgloading/ProtoCpgLoader.scala
index 59008ff46..ed38a892e 100644
--- a/codepropertygraph/src/main/scala/io/shiftleft/codepropertygraph/cpgloading/ProtoCpgLoader.scala
+++ b/codepropertygraph/src/main/scala/io/shiftleft/codepropertygraph/cpgloading/ProtoCpgLoader.scala
@@ -43,9 +43,7 @@ object ProtoCpgLoader {
     val cpg                               = openOrCreateCpg(storagePath)
 
     // first pass: add the raw nodes without any properties or edges
-    protoCpgs().foreach { cpgProto =>
-      addNodesRaw(nodesIter(cpgProto), cpg.graph, protoToGraphNodeMappings)
-    }
+    addNodesRaw(protoCpgs().flatMap(cpgProto => nodesIter(cpgProto)), cpg.graph, protoToGraphNodeMappings)
 
     // second pass: set node properties and add edges
     val diffGraph = Cpg.newDiffGraphBuilder