diff --git a/platform/util/src/com/intellij/util/io/PersistentHashMap.java b/platform/util/src/com/intellij/util/io/PersistentHashMap.java
index 2942d1ec96c8..cac3c0c947ed 100644
--- a/platform/util/src/com/intellij/util/io/PersistentHashMap.java
+++ b/platform/util/src/com/intellij/util/io/PersistentHashMap.java
@@ -120,8 +120,9 @@ public class PersistentHashMap<Key, Value> extends PersistentEnumerator<Key>{
 
   private static File checkDataFiles(final File file) {
     if (!file.exists()) {
-      final String baseName = file.getName() + ".";
-      final File[] files = file.getParentFile().listFiles(new FileFilter() {
+      final File dataFile = getDataFile(file);
+      final String baseName = dataFile.getName();
+      final File[] files = dataFile.getParentFile().listFiles(new FileFilter() {
         public boolean accept(final File pathname) {
           return pathname.getName().startsWith(baseName);
         }