diff --git a/Tynamix.ObjectFiller.Test/BugfixTests/Bug87ErrorWhenNameInParentIsSameAsParent.cs b/Tynamix.ObjectFiller.Test/BugfixTests/Bug87ErrorWhenNameInParentIsSameAsParent.cs
index 9a6f5ea..6ee3583 100644
--- a/Tynamix.ObjectFiller.Test/BugfixTests/Bug87ErrorWhenNameInParentIsSameAsParent.cs
+++ b/Tynamix.ObjectFiller.Test/BugfixTests/Bug87ErrorWhenNameInParentIsSameAsParent.cs
@@ -8,8 +8,8 @@ namespace ObjectFiller.Test.BugfixTests
 {
     using Tynamix.ObjectFiller;
 
-    
 
+    [TestClass]
     public class Bug87ErrorWhenNameInParentIsSameAsParent
     {
         public class Parent
@@ -29,11 +29,16 @@ public class Child
         public void ParentShallGetFilledWithourError()
         {
             Filler<Parent> filler = new Filler<Parent>();
+            filler.Setup()
+                  .OnProperty(x => x.MakeTheError).Use(12345)
+                  .SetupFor<Child>()
+                  .OnProperty(x => x.MakeTheError).Use("TEST");
 
             var filledObject = filler.Create();
             Assert.IsNotNull(filledObject);
-            Assert.IsNotNull(filledObject.MakeTheError);
+            Assert.AreEqual(12345, filledObject.MakeTheError);
             Assert.IsFalse(string.IsNullOrWhiteSpace(filledObject.Child.MakeTheError));
+            Assert.AreEqual("TEST", filledObject.Child.MakeTheError);
         }
     }
 }
diff --git a/Tynamix.ObjectFiller/Filler.cs b/Tynamix.ObjectFiller/Filler.cs
index 1f4b54e..ec375a8 100644
--- a/Tynamix.ObjectFiller/Filler.cs
+++ b/Tynamix.ObjectFiller/Filler.cs
@@ -962,7 +962,9 @@ private IEnumerable<PropertyInfo> GetPropertyFromProperties(
             IEnumerable<PropertyInfo> properties,
             PropertyInfo property)
         {
-            return properties.Where(x => x.Name == property.Name && x.Module.Equals(property.Module));
+            return properties.Where(x => x.Name == property.Name
+                                         && x.Module.Equals(property.Module)
+                                         && x.DeclaringType?.AssemblyQualifiedName == property.DeclaringType?.AssemblyQualifiedName);
         }
 
         /// <summary>