diff --git a/CSharp/Libraries/UniversalEditor.Core/Association.cs b/CSharp/Libraries/UniversalEditor.Core/Association.cs
index c7b32839..3e55d6fe 100644
--- a/CSharp/Libraries/UniversalEditor.Core/Association.cs
+++ b/CSharp/Libraries/UniversalEditor.Core/Association.cs
@@ -196,8 +196,18 @@ namespace UniversalEditor
 				{
 					if (assoc.ObjectModels.Contains(ac.ObjectModel))
 					{
-						associations.Add(assoc);
-						continue;
+						if (ac.DataFormat != null)
+						{
+							if (assoc.DataFormats.Contains(ac.DataFormat))
+							{
+								associations.Add(assoc);
+								continue;
+							}
+						}
+						else
+						{
+							associations.Add(assoc);
+						}
 					}
 				}
 				if (ac.DataFormat != null)