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 6eec7068d..56087ba66 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">
diff --git a/quickfixj-messages/quickfixj-messages-fix50sp2/src/main/resources/FIX50SP2.modified.xml b/quickfixj-messages/quickfixj-messages-fix50sp2/src/main/resources/FIX50SP2.modified.xml
index e54e8be4a..0c99390d2 100644
--- a/quickfixj-messages/quickfixj-messages-fix50sp2/src/main/resources/FIX50SP2.modified.xml
+++ b/quickfixj-messages/quickfixj-messages-fix50sp2/src/main/resources/FIX50SP2.modified.xml
@@ -3502,8 +3502,6 @@
     </component>
     <component name="StrmAsgnRptGrp">
       <group name="NoAsgnReqs" required="N">
-		<!-- MODIFIED: added dummy StreamAsgnReqType field for code generator to work -->
-		<field name="StreamAsgnReqType" required="N"/>
         <component name="Parties" required="N"/>
         <component name="StrmAsgnRptInstrmtGrp" required="N"/>
       </group>
@@ -3786,8 +3784,6 @@
     </component>
     <component name="StrmAsgnReqGrp">
       <group name="NoAsgnReqs" required="N">
-		<!-- MODIFIED: added dummy StreamAsgnReqType field for code generator to work -->
-		<field name="StreamAsgnReqType" required="N"/>
         <component name="Parties" required="N"/>
         <component name="StrmAsgnReqInstrmtGrp" required="N"/>
       </group>