graphql-java
diff --git a/‎src/main/java/graphql/execution/ExecutionStrategy.java‎
Lines changed: 1 addition & 1 deletion b/‎src/main/java/graphql/execution/ExecutionStrategy.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/main/java/graphql/execution/FieldCollector.java‎
Lines changed: 6 additions & 10 deletions b/‎src/main/java/graphql/execution/FieldCollector.java‎
Lines changed: 6 additions & 10 deletions
@@ -160,7 +160,7 @@ public static String mkNameForPath(Field currentField) {
 
     @Internal
     public static String mkNameForPath(MergedField mergedField) {
-        return mkNameForPath(mergedField.getFields());
+        return mergedField.getResultKey();
     }
 
     @Internal
 
@@ -41,12 +41,11 @@ public MergedSelectionSet collectFields(FieldCollectorParameters parameters, Mer
     public MergedSelectionSet collectFields(FieldCollectorParameters parameters, MergedField mergedField, boolean incrementalSupport) {
         Map<String, MergedField> subFields = new LinkedHashMap<>();
         Set<String> visitedFragments = new LinkedHashSet<>();
-        for (Field field : mergedField.getFields()) {
-            if (field.getSelectionSet() == null) {
-                continue;
+        mergedField.forEach(field -> {
+            if (field.getSelectionSet() != null) {
+                this.collectFields(parameters, field.getSelectionSet(), visitedFragments, subFields, null, incrementalSupport);
             }
-            this.collectFields(parameters, field.getSelectionSet(), visitedFragments, subFields, null, incrementalSupport);
-        }
+        });
         return newMergedSelectionSet().subFields(subFields).build();
     }
 
@@ -142,11 +141,8 @@ private void collectField(FieldCollectorParameters parameters, Map<String, Merge
         }
         String name = field.getResultKey();
         if (fields.containsKey(name)) {
-            MergedField curFields = fields.get(name);
-            fields.put(name, curFields.transform(builder -> builder
-                    .addField(field)
-                    .addDeferredExecution(deferredExecution))
-            );
+            MergedField currentMergedField = fields.get(name);
+            fields.put(name, currentMergedField.newMergedFieldWith(field,deferredExecution));
         } else {
             fields.put(name, MergedField.newSingletonMergedField(field, deferredExecution));
         }
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ public static String mkNameForPath(Field currentField) {`
`160`	`160`
`161`	`161`	`@Internal`
`162`	`162`	`public static String mkNameForPath(MergedField mergedField) {`
`163`		`- return mkNameForPath(mergedField.getFields());`
	`163`	`+ return mergedField.getResultKey();`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`@Internal`