diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/DescriptorClassMember.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/DescriptorClassMember.java
index fc89fba21aa..f22e8db19d5 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/DescriptorClassMember.java
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/DescriptorClassMember.java
@@ -37,4 +37,21 @@ public class DescriptorClassMember implements ClassMember {
     public DeclarationDescriptor getDescriptor() {
         return myDescriptor;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        DescriptorClassMember that = (DescriptorClassMember) o;
+
+        if (myDescriptor != null ? !myDescriptor.equals(that.myDescriptor) : that.myDescriptor != null) return false;
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        return myDescriptor != null ? myDescriptor.hashCode() : 0;
+    }
 }