diff --git a/ANX.Framework/NonXNA/AddInSystemFactory.cs b/ANX.Framework/NonXNA/AddInSystemFactory.cs
index 5c2085e5..4d2a0fdc 100644
--- a/ANX.Framework/NonXNA/AddInSystemFactory.cs
+++ b/ANX.Framework/NonXNA/AddInSystemFactory.cs
@@ -153,10 +153,13 @@ namespace ANX.Framework.NonXNA
 			foreach (ICreator creator in creators.Values)
 			{
 				Type[] interfaces = TypeHelper.GetInterfacesFrom(creator.GetType());
-				if(interfaces[0] is T)
-				{
-					yield return creator as T;
-				}
+                foreach (Type t in interfaces)
+                {
+                    if (t.Name.Equals( typeof(T).Name ))
+                    {
+                        yield return creator as T;
+                    }
+                }
 			}
 		}
 		#endregion
diff --git a/Samples/WindowsGame/WindowsGame.csproj b/Samples/WindowsGame/WindowsGame.csproj
index 69a5fea3..d19456df 100644
--- a/Samples/WindowsGame/WindowsGame.csproj
+++ b/Samples/WindowsGame/WindowsGame.csproj
@@ -145,6 +145,10 @@
       <Project>{97185A92-077D-4498-8B6A-8BFF04079044}</Project>
       <Name>ANX.MediaSystem.Windows.OpenAL</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\PlatformSystems\ANX.PlatformSystem.Windows\ANX.PlatformSystem.Windows.csproj">
+      <Project>{068EB2E9-963C-4E1B-8831-E25011F11FFE}</Project>
+      <Name>ANX.PlatformSystem.Windows</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\RenderSystems\ANX.Framework.Windows.DX10\ANX.RenderSystem.Windows.DX10.csproj">
       <Project>{5BE49183-2F6F-4527-AC90-D816911FCF90}</Project>
       <Name>ANX.RenderSystem.Windows.DX10</Name>