diff --git a/src/main/kotlin/org/arend/module/AllArendFilesAndPackagesScope.kt b/src/main/kotlin/org/arend/module/AllArendFilesAndPackagesScope.kt
index fd885e3ba..68a7c14d1 100644
--- a/src/main/kotlin/org/arend/module/AllArendFilesAndPackagesScope.kt
+++ b/src/main/kotlin/org/arend/module/AllArendFilesAndPackagesScope.kt
@@ -87,5 +87,5 @@ class AllArendFilesAndPackagesScope(
 
     override fun getElements(kind: Referable.RefKind?): Collection<Referable> = if (kind == null || kind == Referable.RefKind.EXPR) elements else emptyList()
 
-    override fun resolveNamespace(name: String, onlyInternal: Boolean) = AllArendFilesAndPackagesScope(libraryConfig, ModulePath(extraPath.toList() + name), false)
+    override fun resolveNamespace(name: String, onlyInternal: Boolean) = AllArendFilesAndPackagesScope(libraryConfig, ModulePath(extraPath.toList() + name), false, withArendExtension)
 }
diff --git a/src/main/kotlin/org/arend/psi/ArendFile.kt b/src/main/kotlin/org/arend/psi/ArendFile.kt
index 1b8876afb..08be43347 100644
--- a/src/main/kotlin/org/arend/psi/ArendFile.kt
+++ b/src/main/kotlin/org/arend/psi/ArendFile.kt
@@ -79,7 +79,7 @@ class ArendFile(viewProvider: FileViewProvider) : PsiFileBase(viewProvider, Aren
     val libraryName: String?
         get() = arendLibrary?.name ?: if (name == ArendPreludeLibrary.PRELUDE_FILE_NAME) Prelude.LIBRARY_NAME else null
 
-    val concreteDefinitions = HashMap<LongName, Concrete.Definition>()
+    val concreteDefinitions = ConcurrentHashMap<LongName, Concrete.Definition>()
 
     fun getTCRefMap(refKind: RefKind): ConcurrentHashMap<LongName, IntellijTCReferable> {
         val location = moduleLocation ?: return ConcurrentHashMap<LongName, IntellijTCReferable>()