diff --git a/bake/hclparser/merged.go b/bake/hclparser/merged.go
index d53c788b..6faf6ace 100644
--- a/bake/hclparser/merged.go
+++ b/bake/hclparser/merged.go
@@ -121,7 +121,7 @@ func (mb mergedBodies) JustAttributes() (hcl.Attributes, hcl.Diagnostics) {
 							"Argument %q was already set at %s",
 							name, existing.NameRange.String(),
 						),
-						Subject: &attr.NameRange,
+						Subject: thisAttrs[name].NameRange.Ptr(),
 					})
 				}
 				attrs[name] = attr
@@ -192,7 +192,7 @@ func (mb mergedBodies) mergedContent(schema *hcl.BodySchema, partial bool) (*hcl
 							"Argument %q was already set at %s",
 							name, existing.NameRange.String(),
 						),
-						Subject: &attr.NameRange,
+						Subject: thisContent.Attributes[name].NameRange.Ptr(),
 					})
 				}
 				content.Attributes[name] = attr