diff --git a/xml/xml-psi-impl/src/com/intellij/lexer/XmlHighlightingLexer.java b/xml/xml-psi-impl/src/com/intellij/lexer/XmlHighlightingLexer.java
index 65485236e353..8fd3e8418e2c 100644
--- a/xml/xml-psi-impl/src/com/intellij/lexer/XmlHighlightingLexer.java
+++ b/xml/xml-psi-impl/src/com/intellij/lexer/XmlHighlightingLexer.java
@@ -32,26 +32,13 @@ public class XmlHighlightingLexer extends DelegateLexer {
 
     if (tokenType == null) return tokenType;
 
-    int state = getState() & 0xF;
-
-    tokenType = fixWrongTokenTypes(tokenType, state);
-    if (tokenType != XmlTokenType.XML_COMMENT_CHARACTERS &&
-      tokenType != XmlTokenType.XML_COMMENT_END &&
-      tokenType != XmlTokenType.XML_COMMENT_START &&
-      tokenType != XmlTokenType.XML_ATTRIBUTE_VALUE_START_DELIMITER) {
-
-      // TODO: do not know when this happens!
-      switch (state) {
-        case __XmlLexer.DOCTYPE:
-          tokenType = XmlTokenType.XML_DECL_START;
-          break;
-      }
-    }
+    tokenType = fixWrongTokenTypes(tokenType);
 
     return tokenType;
   }
 
-  static IElementType fixWrongTokenTypes(IElementType tokenType, final int state) {
+  private IElementType fixWrongTokenTypes(IElementType tokenType) {
+    int state = getState();
     if (tokenType == XmlTokenType.XML_NAME) {
       if (state == __XmlLexer.TAG || state == __XmlLexer.END_TAG) {
         // translate XML names for tags into XmlTagName