diff --git a/idea/src/org/jetbrains/jet/plugin/JetBundle.properties b/idea/src/org/jetbrains/jet/plugin/JetBundle.properties
index ec12e968fb3..ee84d2f38ec 100644
--- a/idea/src/org/jetbrains/jet/plugin/JetBundle.properties
+++ b/idea/src/org/jetbrains/jet/plugin/JetBundle.properties
@@ -58,7 +58,9 @@ rename.family=Rename
 add.semicolon.after.invocation=Add semicolon after invocation of ''{0}''
 add.semicolon.family=Add Semicolon
 change.function.return.type=Change ''{0}'' function return type to ''{1}''
+change.no.name.function.return.type=Change function return type to ''{0}''
 remove.function.return.type=Remove explicitly specified return type in ''{0}'' function
+remove.no.name.function.return.type=Remove explicitly specified function return type
 change.element.type=Change ''{0}'' type to ''{1}''
 change.type=Change type from ''{0}'' to ''{1}''
 change.type.family=Change Type
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java
index 66fcfe8448a..681b3cfdb2d 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java
@@ -36,6 +36,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.BindingContextUtils;
 import org.jetbrains.jet.lang.resolve.DescriptorResolver;
 import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
+import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
@@ -56,16 +57,17 @@ public class ChangeFunctionReturnTypeFix extends JetIntentionAction<JetNamedFunc
     @Override
     public String getText() {
         String functionName = element.getName();
-        BindingContext context = AnalyzerFacadeWithCache.analyzeFileWithCache((JetFile) element.getContainingFile()).getBindingContext();
-        SimpleFunctionDescriptor descriptor = context.get(BindingContext.FUNCTION, element);
-        if (descriptor != null) {
-            functionName = descriptor.getContainingDeclaration().getName() + "." + functionName;
-        }
+        FqName fqName = JetPsiUtil.getFQName(element);
+        if (fqName != null) functionName = fqName.getFqName();
 
         if (KotlinBuiltIns.getInstance().isUnit(type) && element.hasBlockBody()) {
-            return JetBundle.message("remove.function.return.type", functionName);
+            return functionName == null ?
+                   JetBundle.message("remove.no.name.function.return.type") :
+                   JetBundle.message("remove.function.return.type", functionName);
         }
-        return JetBundle.message("change.function.return.type", functionName, type.toString());
+        return functionName == null ?
+               JetBundle.message("change.no.name.function.return.type", type.toString()) :
+               JetBundle.message("change.function.return.type", functionName, type.toString());
     }
 
     @NotNull