diff --git a/python/src/com/jetbrains/python/psi/impl/PyQualifiedReferenceImpl.java b/python/src/com/jetbrains/python/psi/impl/PyQualifiedReferenceImpl.java
index 2adea76c92a1..72638e7ffbcf 100644
--- a/python/src/com/jetbrains/python/psi/impl/PyQualifiedReferenceImpl.java
+++ b/python/src/com/jetbrains/python/psi/impl/PyQualifiedReferenceImpl.java
@@ -18,7 +18,7 @@ import java.util.*;
  * @author yole
  */
 public class PyQualifiedReferenceImpl extends PyReferenceImpl {
-  public PyQualifiedReferenceImpl(PyReferenceExpressionImpl element) {
+  public PyQualifiedReferenceImpl(PyQualifiedExpression element) {
     super(element);
   }
 
diff --git a/python/src/com/jetbrains/python/psi/impl/PyReferenceImpl.java b/python/src/com/jetbrains/python/psi/impl/PyReferenceImpl.java
index 970b8b33de14..fddd30af6a99 100644
--- a/python/src/com/jetbrains/python/psi/impl/PyReferenceImpl.java
+++ b/python/src/com/jetbrains/python/psi/impl/PyReferenceImpl.java
@@ -33,7 +33,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 public class PyReferenceImpl implements PsiReferenceEx, PsiPolyVariantReference {
   protected final PyQualifiedExpression myElement;
 
-  public PyReferenceImpl(PyReferenceExpressionImpl element) {
+  public PyReferenceImpl(PyQualifiedExpression element) {
     myElement = element;
   }
 
diff --git a/python/src/com/jetbrains/python/psi/impl/PyTargetExpressionImpl.java b/python/src/com/jetbrains/python/psi/impl/PyTargetExpressionImpl.java
index 17c594330424..d6f92ba585bc 100644
--- a/python/src/com/jetbrains/python/psi/impl/PyTargetExpressionImpl.java
+++ b/python/src/com/jetbrains/python/psi/impl/PyTargetExpressionImpl.java
@@ -3,6 +3,7 @@ package com.jetbrains.python.psi.impl;
 import com.intellij.lang.ASTNode;
 import com.intellij.openapi.util.Pair;
 import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiReference;
 import com.intellij.psi.ResolveState;
 import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.psi.util.PsiTreeUtil;
@@ -161,4 +162,12 @@ public class PyTargetExpressionImpl extends PyPresentableElementImpl<PyTargetExp
     final PyExpression value = findAssignedValue();
     return value instanceof PyReferenceExpression ? ((PyReferenceExpression) value).asQualifiedName() : null;
   }
+
+  @Override
+  public PsiReference getReference() {
+    if (getQualifier() != null) {
+      return new PyQualifiedReferenceImpl(this);
+    }
+    return null;
+  }
 }
diff --git a/python/testData/resolve/Property.py b/python/testData/resolve/Property.py
new file mode 100644
index 000000000000..c2fc5710df14
--- /dev/null
+++ b/python/testData/resolve/Property.py
@@ -0,0 +1,11 @@
+class Person(object):
+   def get_full_name(self):
+       return "%s %s" % (self.first_name, self.last_name)
+
+   def set_full_name(self, full_name):
+       self.first_name, self.last_name = full_name.split()
+
+   full_name = property(get_full_name, set_full_name)
+
+p = Person()
+p.fu<ref>ll_name = "Dmitry Jemerov"
diff --git a/python/testSrc/com/jetbrains/python/PyResolveTest.java b/python/testSrc/com/jetbrains/python/PyResolveTest.java
index 4cc09d7927e1..8cd4344a5225 100644
--- a/python/testSrc/com/jetbrains/python/PyResolveTest.java
+++ b/python/testSrc/com/jetbrains/python/PyResolveTest.java
@@ -239,4 +239,9 @@ public class PyResolveTest extends PyResolveTestCase {
     PsiElement targetElement = resolve();
     assertNull(targetElement);
   }
+
+  public void testProperty() throws Exception {
+    PsiElement targetElement = resolve();
+    assertTrue(targetElement instanceof PyTargetExpression);
+  }
 }
\ No newline at end of file