diff --git a/cmd/generate-fix/internal/templates.go b/cmd/generate-fix/internal/templates.go
index 00b9e5936..93d01f8a2 100644
--- a/cmd/generate-fix/internal/templates.go
+++ b/cmd/generate-fix/internal/templates.go
@@ -282,9 +282,9 @@ type {{ .Name }} struct {
 // FromMessage creates a {{ .Name }} from a quickfix.Message instance.
 func FromMessage(m *quickfix.Message) {{ .Name }} {
 	return {{ .Name }}{
-		Header: {{ .TransportPackage}}.Header{&m.Header},
+		Header: {{ .TransportPackage}}.Header{Header: &m.Header},
 		Body: &m.Body,
-		Trailer: {{ .TransportPackage}}.Trailer{&m.Trailer},
+		Trailer: {{ .TransportPackage}}.Trailer{Trailer: &m.Trailer},
 		Message: m,
 	}
 }