diff --git a/quickfixj-codegenerator/src/main/resources/org/quickfixj/codegenerator/MessageSubclass.xsl b/quickfixj-codegenerator/src/main/resources/org/quickfixj/codegenerator/MessageSubclass.xsl
index 6eec706..bad8770 100644
--- a/quickfixj-codegenerator/src/main/resources/org/quickfixj/codegenerator/MessageSubclass.xsl
+++ b/quickfixj-codegenerator/src/main/resources/org/quickfixj/codegenerator/MessageSubclass.xsl
@@ -191,7 +191,10 @@ import quickfix.Group;</xsl:if>
 </xsl:template>
 
 <xsl:template mode="group-delimeter" match="group">
-	<xsl:value-of select="@number"/>
+	<xsl:if test="position() = 1">
+		<xsl:variable name="name" select="@name"/>
+		<xsl:value-of select="/fix/fields/field[@name=$name]/@number"/>
+	</xsl:if>
 </xsl:template>
 
 <xsl:template mode="group-delimeter" match="group//component">