diff --git a/XmlSchemaClassGenerator/NamespaceProvider.cs b/XmlSchemaClassGenerator/NamespaceProvider.cs
index a24aa953..4ae504a9 100644
--- a/XmlSchemaClassGenerator/NamespaceProvider.cs
+++ b/XmlSchemaClassGenerator/NamespaceProvider.cs
@@ -165,10 +165,14 @@ public string FindNamespace(NamespaceKey key, string defaultNamespace = null)
             foreach (var keyValue in keyValues)
             {
                 string result;
-                if (TryGetValue(keyValue, out result))
+                if (InternalDictionary.TryGetValue(keyValue, out result))
                     return result;
             }
 
+            string ns;
+            if (TryGenerateNamespace(key, out ns))
+                return ns;
+
             return defaultNamespace;
         }
     }