diff --git a/python/src/com/jetbrains/python/psi/search/PyDefinitionsSearch.java b/python/src/com/jetbrains/python/psi/search/PyDefinitionsSearch.java
index fc3beca03807..26c952fe32c4 100644
--- a/python/src/com/jetbrains/python/psi/search/PyDefinitionsSearch.java
+++ b/python/src/com/jetbrains/python/psi/search/PyDefinitionsSearch.java
@@ -4,8 +4,10 @@ import com.intellij.psi.PsiElement;
 import com.intellij.util.Processor;
 import com.intellij.util.Query;
 import com.intellij.util.QueryExecutor;
+import com.jetbrains.python.psi.PyAssignmentStatement;
 import com.jetbrains.python.psi.PyClass;
 import com.jetbrains.python.psi.PyFunction;
+import com.jetbrains.python.psi.PyTargetExpression;
 
 /**
  * @author yole
@@ -28,6 +30,12 @@ public class PyDefinitionsSearch implements QueryExecutor<PsiElement, PsiElement
         }
       });
     }
+    else if (queryParameters instanceof PyTargetExpression) {  // PY-237
+      final PsiElement parent = queryParameters.getParent();
+      if (parent instanceof PyAssignmentStatement) {
+        return consumer.process(parent);        
+      }
+    }
     return true;
   }
 }