diff --git a/python/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java b/python/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java
index 35585068c7b4..8c71346575cc 100644
--- a/python/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java
+++ b/python/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java
@@ -228,7 +228,7 @@ public class PyFunctionImpl extends PyPresentableElementImpl<PyFunctionStub> imp
         if (returnClassType.getPyClass() == getContainingClass()) {
           final PyType receiverType = context.getType(receiver);
           if (receiverType instanceof PyClassType && PyTypeChecker.match(returnType, receiverType, context)) {
-            return receiverType;
+            return returnClassType.isDefinition() ? receiverType : ((PyClassType)receiverType).toInstance();
           }
         }
       }