diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/SeverityRegistrar.java b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/SeverityRegistrar.java
index 6a2f7cea29e7..1dbbc1bb8b2a 100644
--- a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/SeverityRegistrar.java
+++ b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/SeverityRegistrar.java
@@ -167,13 +167,11 @@ public class SeverityRegistrar implements Comparator<HighlightSeverity> {
     else {
       //enforce include all known
       List<HighlightSeverity> list = getOrderAsList(orderMap);
-      for (int i = 0; i < knownSeverities.size(); i++) {
-        HighlightSeverity stdSeverity = knownSeverities.get(i);
+      for (HighlightSeverity stdSeverity : knownSeverities) {
         if (!list.contains(stdSeverity)) {
           for (int oIdx = 0; oIdx < list.size(); oIdx++) {
             HighlightSeverity orderSeverity = list.get(oIdx);
-            HighlightInfoType type = STANDARD_SEVERITIES.get(orderSeverity.getName());
-            if (type != null && knownSeverities.indexOf(type.getSeverity(null)) > i) {
+            if (orderSeverity.myVal > stdSeverity.myVal) {
               list.add(oIdx, stdSeverity);
               myReadOrder = null;
               break;