diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirEffectiveVisibilityResolverImpl.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirEffectiveVisibilityResolverImpl.kt
index 53d3191ae31..4de58f4a04f 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirEffectiveVisibilityResolverImpl.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirEffectiveVisibilityResolverImpl.kt
@@ -113,10 +113,7 @@ class FirEffectiveVisibilityResolverImpl(private val session: FirSession) : FirE
             val declaration = containingDeclarations[index]
             val declarationClassId = declaration.getClassId()
 
-            // because classId's we take from firs are
-            // not the same instances we find in containingDeclarations
-            // TODO: fix
-            if (this.asSingleFqName() == declarationClassId?.asSingleFqName()) {
+            if (this.relativeClassName == declarationClassId?.relativeClassName) {
                 return when (declaration) {
                     is FirRegularClass -> {
                         declaration.symbol to resolveFor(declaration, containingDeclarations.subList(0, index), scopeSession)