diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/ResolverScopeData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/ResolverScopeData.java
index 710cd2e17c3..86bab0cdb04 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/ResolverScopeData.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/ResolverScopeData.java
@@ -41,11 +41,6 @@ public abstract class ResolverScopeData {
         return psiPackage;
     }
 
-    @Nullable
-    public FqName getFqName() {
-        return fqName;
-    }
-
     public boolean isStaticMembers() {
         return staticMembers;
     }
@@ -58,8 +53,6 @@ public abstract class ResolverScopeData {
     private final PsiClass psiClass;
     @Nullable
     private final PsiPackage psiPackage;
-    @Nullable
-    private final FqName fqName;
     private final boolean staticMembers;
     private final boolean kotlin;
 
@@ -73,7 +66,6 @@ public abstract class ResolverScopeData {
 
         this.psiClass = psiClass;
         this.psiPackage = psiPackage;
-        this.fqName = fqName;
 
         if (psiClass == null && psiPackage == null) {
             throw new IllegalStateException("both psiClass and psiPackage cannot be null");
@@ -82,6 +74,7 @@ public abstract class ResolverScopeData {
         this.staticMembers = staticMembers;
         this.kotlin = psiClass != null && DescriptorResolverUtils.isKotlinClass(psiClass);
 
+        //TODO: move check to remove fqName parameter
         if (fqName != null && fqName.lastSegmentIs(Name.identifier(JvmAbi.PACKAGE_CLASS)) && psiClass != null && kotlin) {
             throw new IllegalStateException("Kotlin namespace cannot have last segment " + JvmAbi.PACKAGE_CLASS + ": " + fqName);
         }
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaBaseScope.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaBaseScope.java
index 0f2acb4ba74..bb76615a1a6 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaBaseScope.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaBaseScope.java
@@ -23,10 +23,8 @@ import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiPackage;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lang.descriptors.ClassOrNamespaceDescriptor;
-import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
-import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
-import org.jetbrains.jet.lang.descriptors.VariableDescriptor;
+import org.jetbrains.jet.lang.descriptors.*;
+import org.jetbrains.jet.lang.resolve.DescriptorUtils;
 import org.jetbrains.jet.lang.resolve.java.JavaSemanticServices;
 import org.jetbrains.jet.lang.resolve.java.NamedMembers;
 import org.jetbrains.jet.lang.resolve.java.data.ResolverScopeData;
@@ -142,7 +140,8 @@ public abstract class JavaBaseScope extends JetScopeImpl {
 
         PsiPackage psiPackage = resolverScopeData.getPsiPackage();
         if (psiPackage != null) {
-            result.addAll(computeAllPackageDeclarations(psiPackage, semanticServices, resolverScopeData.getFqName()));
+            assert descriptor instanceof NamespaceDescriptor;
+            result.addAll(computeAllPackageDeclarations(psiPackage, semanticServices, DescriptorUtils.getFQName(descriptor).toSafe()));
         }
         return result;
     }