diff --git a/CHANGELOG.md b/CHANGELOG.md
index f8518dbb..97cad1e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ In previous releases, the name "Hypermode" was used for all three._
 - Change default for environment setting [#439](https://github.com/hypermodeinc/modus/pull/439)
 - Remove compatibility code for previous versions [#441](https://github.com/hypermodeinc/modus/pull/441)
 - Target Node 22 [#446](https://github.com/hypermodeinc/modus/pull/446)
+- Fix object/map field stitching [#447](https://github.com/hypermodeinc/modus/pull/447)
 - Use cli component instead of direct node execution modus-sdk-as [#448](https://github.com/hypermodeinc/modus/pull/448)
 
 ## 2024-10-02 - Version 0.12.7
diff --git a/runtime/graphql/datasource/planner.go b/runtime/graphql/datasource/planner.go
index e8d0b404..7702f57a 100644
--- a/runtime/graphql/datasource/planner.go
+++ b/runtime/graphql/datasource/planner.go
@@ -124,8 +124,8 @@ func (p *HypDSPlanner) stitchFields(f *fieldInfo) {
 	f.Fields = make([]fieldInfo, len(f.fieldRefs))
 	for i, ref := range f.fieldRefs {
 		field := p.fields[ref]
-		f.Fields[i] = field
 		p.stitchFields(&field)
+		f.Fields[i] = field
 	}
 }