diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/Utils.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/Utils.kt
index 2d7a82ce68b..db53246500c 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/Utils.kt
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/Utils.kt
@@ -87,9 +87,8 @@ public fun ThisReceiver.asExpression(resolutionScope: JetScope, psiFactory: JetP
 
 public fun PsiElement.getResolutionScope(bindingContext: BindingContext, resolutionFacade: ResolutionFacade): LexicalScope {
     for (parent in parentsWithSelf) {
-        if (parent is JetExpression) {
-            val scope = bindingContext[BindingContext.LEXICAL_SCOPE, parent] ?:
-                        bindingContext[BindingContext.RESOLUTION_SCOPE, parent]?.asLexicalScope() // todo remove this hack
+        if (parent is JetElement) {
+            val scope = bindingContext[BindingContext.LEXICAL_SCOPE, parent]
             if (scope != null) return scope
         }