diff --git a/build/src/org/jibx/schema/codegen/CodeGen.java b/build/src/org/jibx/schema/codegen/CodeGen.java
index aa3566a..da3b615 100644
--- a/build/src/org/jibx/schema/codegen/CodeGen.java
+++ b/build/src/org/jibx/schema/codegen/CodeGen.java
@@ -1356,7 +1356,7 @@ private void buildClassesAndBindings(ArrayList defs, Map typeinst) {
                     mapping.setAbstract(element.isAbstract());
                     QName group = element.getSubstitutionGroup();
                     if (group != null) {
-                        ElementElement base = m_validationContext.findElement(group);
+                        ElementElement base = schema.getRegister().findElement(group);
                         DefinitionItem basedef = ((GlobalExtension)base.getExtension()).getDefinition();
                         mapping.setExtendsName(basedef.getGenerateClass().getFullName());
                     }
@@ -1390,7 +1390,7 @@ private void buildClassesAndBindings(ArrayList defs, Map typeinst) {
                     // handle linking to substitution group head using extends mapping
                     QName group = element.getSubstitutionGroup();
                     if (group != null) {
-                        ElementElement base = m_validationContext.findElement(group);
+                        ElementElement base = schema.getRegister().findElement(group);
                         DefinitionItem basedef = ((GlobalExtension)base.getExtension()).getDefinition();
                         elmapping.setExtendsName(basedef.getGenerateClass().getFullName());
                     }
@@ -2296,4 +2296,4 @@ public void exit(ElementElement node) {
             super.exit(node);
         }
     }
-}
\ No newline at end of file
+}