diff --git a/src/Markup/Perspex.Markup.Xaml/Context/PerspexNamespaceRegistry.cs b/src/Markup/Perspex.Markup.Xaml/Context/PerspexNamespaceRegistry.cs
index 9295d2c2dd..4db1a89e7c 100644
--- a/src/Markup/Perspex.Markup.Xaml/Context/PerspexNamespaceRegistry.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Context/PerspexNamespaceRegistry.cs
@@ -148,7 +148,7 @@ namespace Perspex.Markup.Xaml.Context
                         _namespaces.Add(xamlNamespace);
                     }
                         
-                    var clrNamespaces = namespaces.SelectMany(x => x).Select(x => x.ClrNamespace);
+                    var clrNamespaces = nsa.Select(x => x.ClrNamespace);
                     xamlNamespace.Addresses.Add(new ConfiguredAssemblyWithNamespaces(assembly, clrNamespaces));
                 }
 
diff --git a/src/Markup/Perspex.Markup.Xaml/OmniXAML b/src/Markup/Perspex.Markup.Xaml/OmniXAML
index 2b41f290bd..db1fb8cdb4 160000
--- a/src/Markup/Perspex.Markup.Xaml/OmniXAML
+++ b/src/Markup/Perspex.Markup.Xaml/OmniXAML
@@ -1 +1 @@
-Subproject commit 2b41f290bdf4dce07730a8f55622a637f966945b
+Subproject commit db1fb8cdb4825f19df5fb71e63eacb3b4456a1d5