diff --git a/src/Ninject.Test/Integration/ConditionalBindingTests.cs b/src/Ninject.Test/Integration/ConditionalBindingTests.cs
index d3d2a83c..48791db9 100644
--- a/src/Ninject.Test/Integration/ConditionalBindingTests.cs
+++ b/src/Ninject.Test/Integration/ConditionalBindingTests.cs
@@ -352,6 +352,39 @@ public void WhenNoAncestorMatchesAppliesToGrandParentAndParent()
             barack.Warrior.Weapon.Should().BeOfType<Dagger>();
         }
 
+        [Fact]
+        public void WhenMemberHasDoesNotConsiderAttributeOnTarget()
+        {
+            kernel.Bind<Knight>().ToSelf();
+            kernel.Bind<IWeapon>().To<Sword>();
+            kernel.Bind<IWeapon>().To<ShortSword>().WhenMemberHas<WeakAttribute>();
+
+            var knight = kernel.Get<Knight>();
+            knight.Weapon.Should().BeOfType<Sword>();
+        }
+
+        [Fact]
+        public void WhenMemberHasDoesConsiderAttributeOnMember()
+        {
+            kernel.Bind<Knight>().ToSelf();
+            kernel.Bind<IWeapon>().To<Sword>().WhenMemberHas<StrongAttribute>();
+            kernel.Bind<IWeapon>().To<ShortSword>();
+
+            var knight = kernel.Get<Knight>();
+            knight.Weapon.Should().BeOfType<Sword>();
+        }
+
+        [Fact]
+        public void WhenTargetHasDoesConsiderAttributeOnTarget()
+        {
+            kernel.Bind<Knight>().ToSelf();
+            kernel.Bind<IWeapon>().To<Sword>();
+            kernel.Bind<IWeapon>().To<ShortSword>().WhenTargetHas<WeakAttribute>();
+
+            var knight = kernel.Get<Knight>();
+            knight.Weapon.Should().BeOfType<ShortSword>();
+        }
+
         public interface IGenericService<T>
         {
         }
@@ -391,5 +424,16 @@ public AnotherGenericService(IWarrior warrior)
 
             public IWarrior Warrior { get; protected set; }
         }
+
+        public class Knight
+        {
+            public IWeapon Weapon { get; private set; }
+
+            [Strong]
+            public Knight([Weak] IWeapon weapon)
+            {
+                this.Weapon = weapon;
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Ninject/Planning/Bindings/BindingConfigurationBuilder.cs b/src/Ninject/Planning/Bindings/BindingConfigurationBuilder.cs
index bb060d88..2df02af3 100644
--- a/src/Ninject/Planning/Bindings/BindingConfigurationBuilder.cs
+++ b/src/Ninject/Planning/Bindings/BindingConfigurationBuilder.cs
@@ -310,7 +310,7 @@ public IBindingInNamedWithOrOnSyntax<T> WhenMemberHas(Type attributeType)
                 throw new InvalidOperationException(ExceptionFormatter.InvalidAttributeTypeUsedInBindingCondition(this.serviceNames, "WhenMemberHas", attributeType));
             }
             
-            this.BindingConfiguration.Condition = r => r.Target != null && r.Target.IsDefined(attributeType, true);
+            this.BindingConfiguration.Condition = r => r.Target != null && r.Target.Member.IsDefined(attributeType, true);
 
             return this;
         }