diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/PackageIndexUtil.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/PackageIndexUtil.kt
index f11f4e5a1aa..b3b17181f77 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/PackageIndexUtil.kt
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/PackageIndexUtil.kt
@@ -48,18 +48,19 @@ public object PackageIndexUtil {
             searchScope: GlobalSearchScope,
             project: Project
     ): Boolean {
-        return containsAny(packageFqName, searchScope, project, JetExactPackagesIndex.getInstance().getKey()) ||
+        return containsFilesWithExactPackage(packageFqName, searchScope, project) ||
                SubpackagesIndexService.getInstance(project).hasSubpackages(packageFqName, searchScope)
     }
 
-    platformStatic public fun containsAny(
+    platformStatic public fun containsFilesWithExactPackage(
             packageFqName: FqName,
             searchScope: GlobalSearchScope,
-            project: Project,
-            key: StubIndexKey<String, JetFile>
+            project: Project
     ): Boolean {
         var result = false
-        StubIndex.getInstance().processElements<String, JetFile>(key, packageFqName.asString(), project, searchScope, javaClass<JetFile>()) {
+        StubIndex.getInstance().processElements<String, JetFile>(
+                JetExactPackagesIndex.getInstance().getKey(), packageFqName.asString(), project, searchScope, javaClass<JetFile>()
+        ) {
             result = true
             false
         }
diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/SubpackagesIndexService.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/SubpackagesIndexService.kt
index 2ee3ca38ed1..5bbed688ee0 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/SubpackagesIndexService.kt
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/SubpackagesIndexService.kt
@@ -55,7 +55,7 @@ public class SubpackagesIndexService(private val project: Project) {
 
         public fun hasSubpackages(fqName: FqName, scope: GlobalSearchScope): Boolean {
             return fqNameByPrefix[fqName].any { packageWithFilesFqName ->
-                PackageIndexUtil.containsAny(packageWithFilesFqName, scope, project, JetExactPackagesIndex.getInstance().getKey())
+                PackageIndexUtil.containsFilesWithExactPackage(packageWithFilesFqName, scope, project)
             }
         }
 
@@ -68,9 +68,7 @@ public class SubpackagesIndexService(private val project: Project) {
                 if (candidateSubPackageShortName in existingSubPackagesShortNames) {
                     continue
                 }
-                val existsInThisScope = PackageIndexUtil.containsAny(
-                        filesFqName, scope, project, JetExactPackagesIndex.getInstance().getKey()
-                )
+                val existsInThisScope = PackageIndexUtil.containsFilesWithExactPackage(filesFqName, scope, project)
                 if (existsInThisScope) {
                     existingSubPackagesShortNames.add(candidateSubPackageShortName)
                 }