diff --git a/java/java-impl/src/com/intellij/codeInspection/reference/RefJavaManagerImpl.java b/java/java-impl/src/com/intellij/codeInspection/reference/RefJavaManagerImpl.java
index b4e31fbe7318..0ffcbec82f62 100644
--- a/java/java-impl/src/com/intellij/codeInspection/reference/RefJavaManagerImpl.java
+++ b/java/java-impl/src/com/intellij/codeInspection/reference/RefJavaManagerImpl.java
@@ -33,6 +33,8 @@ import gnu.trove.THashMap;
 import org.jdom.Element;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Map;
+
 /**
  * @author anna
  * Date: 20-Dec-2007
@@ -133,7 +135,7 @@ public class RefJavaManagerImpl extends RefJavaManager {
         refPackage.accept(visitor);
       }
     }
-    final THashMap<PsiAnchor, RefElement> refTable = myRefManager.getRefTable();
+    final Map<PsiAnchor, RefElement> refTable = myRefManager.getRefTable();
     for (RefElement refElement : refTable.values()) {
       if (refElement instanceof RefClass) {
         RefClass refClass = (RefClass)refElement;
diff --git a/platform/lang-impl/src/com/intellij/codeInspection/reference/RefManagerImpl.java b/platform/lang-impl/src/com/intellij/codeInspection/reference/RefManagerImpl.java
index 626490265606..aa6eefd4bac3 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/reference/RefManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/reference/RefManagerImpl.java
@@ -36,8 +36,8 @@ import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.PathMacroManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Document;
-import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.extensions.ExtensionPoint;
+import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ProjectUtil;
@@ -63,7 +63,7 @@ public class RefManagerImpl extends RefManager {
   private final Project myProject;
   private AnalysisScope myScope;
   private RefProject myRefProject;
-  private THashMap<PsiAnchor, RefElement> myRefTable;
+  private Map<PsiAnchor, RefElement> myRefTable;
 
   private THashMap<Module, RefModule> myModules;
   private final ProjectIterator myProjectIterator;
@@ -87,7 +87,7 @@ public class RefManagerImpl extends RefManager {
     myContext = context;
     myPsiManager = PsiManager.getInstance(project);
     myRefProject = new RefProjectImpl(this);
-    myRefTable = new THashMap<PsiAnchor, RefElement>();
+    myRefTable = new LinkedHashMap<PsiAnchor, RefElement>();
     myProjectIterator = new ProjectIterator();
     for (InspectionExtensionsFactory factory : Extensions.getExtensions(InspectionExtensionsFactory.EP_NAME)) {
       final RefManagerExtension extension = factory.createRefManagerExtension(this);
@@ -101,7 +101,7 @@ public class RefManagerImpl extends RefManager {
   public void iterate(RefVisitor visitor) {
     myLock.readLock().lock();
     try {
-      final THashMap<PsiAnchor, RefElement> refTable = getRefTable();
+      final Map<PsiAnchor, RefElement> refTable = getRefTable();
       for (RefElement refElement : refTable.values()) {
         refElement.accept(visitor);
       }
@@ -299,7 +299,7 @@ public class RefManagerImpl extends RefManager {
     return myRefProject;
   }
 
-  public THashMap<PsiAnchor, RefElement> getRefTable() {
+  public Map<PsiAnchor, RefElement> getRefTable() {
     return myRefTable;
   }
 
@@ -311,7 +311,7 @@ public class RefManagerImpl extends RefManager {
   public void removeReference(RefElement refElem) {
     myLock.writeLock().lock();
     try {
-      final THashMap<PsiAnchor, RefElement> refTable = getRefTable();
+      final Map<PsiAnchor, RefElement> refTable = getRefTable();
       final PsiElement element = refElem.getElement();
       final RefManagerExtension extension = element != null ? getExtension(element.getLanguage()) : null;
       if (extension != null) {