diff --git a/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneLoadTemplate.cpp b/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneLoadTemplate.cpp
index 0049413b..bbed76cc 100644
--- a/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneLoadTemplate.cpp
+++ b/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneLoadTemplate.cpp
@@ -576,8 +576,11 @@ namespace
             }
 
             // Always fill dynamic members last
-            if (dynamicMember)
+            if (dynamicMember && dynamicMember->m_type->m_definition == info.m_definition)
+            {
+                LINE("// dynamic member")
                 PrintFillStruct_Member(info, *dynamicMember, DeclarationModifierComputations(dynamicMember), 0u);
+            }
         }
 
         void PrintFillStructMethod(const StructureInformation* info)