diff --git a/idea/src/org/jetbrains/kotlin/idea/KotlinLightConstantExpressionEvaluator.kt b/idea/src/org/jetbrains/kotlin/idea/KotlinLightConstantExpressionEvaluator.kt
index 60585bab77b..0046c2a816f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/KotlinLightConstantExpressionEvaluator.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/KotlinLightConstantExpressionEvaluator.kt
@@ -66,7 +66,7 @@ class KotlinLightConstantExpressionEvaluator : ConstantExpressionEvaluator {
             is PsiExpression -> {
                 JavaPsiFacade.getInstance(expressionToCompute.project)
                         .constantEvaluationHelper
-                        .computeExpression(expression, throwExceptionOnOverflow, auxEvaluator)
+                        .computeExpression(expressionToCompute, throwExceptionOnOverflow, auxEvaluator)
             }
 
             else -> null
diff --git a/idea/tests/org/jetbrains/kotlin/asJava/KtLightAnnotationTest.kt b/idea/tests/org/jetbrains/kotlin/asJava/KtLightAnnotationTest.kt
index d5958337b0b..7e99b2d1fc7 100644
--- a/idea/tests/org/jetbrains/kotlin/asJava/KtLightAnnotationTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/asJava/KtLightAnnotationTest.kt
@@ -16,10 +16,7 @@
 
 package org.jetbrains.kotlin.asJava
 
-import com.intellij.psi.PsiAnnotation
-import com.intellij.psi.PsiArrayInitializerMemberValue
-import com.intellij.psi.PsiElement
-import com.intellij.psi.PsiModifierListOwner
+import com.intellij.psi.*
 import com.intellij.testFramework.LightProjectDescriptor
 import junit.framework.TestCase
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
@@ -53,6 +50,9 @@ class KtLightAnnotationTest : KotlinLightCodeInsightFixtureTestCase() {
                 .expectAnnotations(2).single { it.qualifiedName == "Autowired" }
         val annotationAttributeVal = annotations.findAttributeValue("required") as PsiElement
         assertTextAndRange("true", annotationAttributeVal)
+
+        val computed = JavaPsiFacade.getInstance(project).constantEvaluationHelper.computeConstantExpression(annotationAttributeVal)
+        TestCase.assertEquals(true, computed)
     }
 
     fun testAnnotationsInAnnotationsDeclarations() {