diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/workspacemodel/EntityToElement.kt b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/workspacemodel/EntityToElement.kt
index d3a221f08c92..7b0cc6a8e859 100644
--- a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/workspacemodel/EntityToElement.kt
+++ b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/workspacemodel/EntityToElement.kt
@@ -38,7 +38,7 @@ internal fun CompositePackagingElementEntity.toCompositeElement(
 
   var existing = try {
     testCheck(1)
-    storage.current.elements.getDataByEntity(this)
+    storage.base.elements.getDataByEntity(this)
   }
   catch (e: Exception) {
     rwLock.readLock().unlock()
@@ -50,7 +50,7 @@ internal fun CompositePackagingElementEntity.toCompositeElement(
     try {
       testCheck(2)
       // Double check
-      existing = storage.current.elements.getDataByEntity(this)
+      existing = storage.base.elements.getDataByEntity(this)
       if (existing == null) {
         val element = when (this) {
           is DirectoryPackagingElementEntity -> {
@@ -109,7 +109,7 @@ fun PackagingElementEntity.toElement(project: Project, storage: VersionedEntityS
 
   var existing = try {
     testCheck(3)
-    storage.current.elements.getDataByEntity(this)
+    storage.base.elements.getDataByEntity(this)
   }
   catch (e: Exception) {
     rwLock.readLock().unlock()
@@ -121,7 +121,7 @@ fun PackagingElementEntity.toElement(project: Project, storage: VersionedEntityS
     try {
       testCheck(4)
       // Double check
-      existing = storage.current.elements.getDataByEntity(this)
+      existing = storage.base.elements.getDataByEntity(this)
       if (existing == null) {
         val element = when (this) {
           is ModuleOutputPackagingElementEntity -> {
@@ -187,7 +187,7 @@ fun PackagingElementEntity.toElement(project: Project, storage: VersionedEntityS
           is DirectoryPackagingElementEntity -> this.toCompositeElement(project, storage, false)
           is ArtifactRootElementEntity -> this.toCompositeElement(project, storage, false)
           is LibraryFilesPackagingElementEntity -> {
-            val mapping = storage.current.getExternalMapping<PackagingElement<*>>("intellij.artifacts.packaging.elements")
+            val mapping = storage.base.getExternalMapping<PackagingElement<*>>("intellij.artifacts.packaging.elements")
             val data = mapping.getDataByEntity(this)
             if (data != null) {
               return data
@@ -234,7 +234,7 @@ fun PackagingElementEntity.toElement(project: Project, storage: VersionedEntityS
 
 private fun CustomPackagingElementEntity.unpackCustomElement(storage: VersionedEntityStorage,
                                                              project: Project): PackagingElement<*> {
-  val mapping = storage.current.getExternalMapping<PackagingElement<*>>("intellij.artifacts.packaging.elements")
+  val mapping = storage.base.getExternalMapping<PackagingElement<*>>("intellij.artifacts.packaging.elements")
   val data = mapping.getDataByEntity(this)
   if (data != null) {
     return data