diff --git a/plugins/devkit/devkit-core/src/dom/ExtensionOrderConverter.java b/plugins/devkit/devkit-core/src/dom/ExtensionOrderConverter.java
index 75d28d4cd4c3..f733a2273c53 100644
--- a/plugins/devkit/devkit-core/src/dom/ExtensionOrderConverter.java
+++ b/plugins/devkit/devkit-core/src/dom/ExtensionOrderConverter.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.idea.devkit.dom;
 
 import com.intellij.codeInsight.completion.CompletionUtil;
@@ -125,7 +125,7 @@ public class ExtensionOrderConverter implements CustomReferenceConverter<String>
     return (trimKeyword ? LoadingOrder.BEFORE_STR.trim() : LoadingOrder.BEFORE_STR).equalsIgnoreCase(str) ||
            (trimKeyword ? LoadingOrder.AFTER_STR.trim(): LoadingOrder.AFTER_STR).equalsIgnoreCase(str) ||
            LoadingOrder.BEFORE_STR_OLD.equalsIgnoreCase(str) ||
-           LoadingOrder.BEFORE_STR_OLD.equalsIgnoreCase(str);
+           LoadingOrder.AFTER_STR_OLD.equalsIgnoreCase(str);
   }
 
 
diff --git a/plugins/devkit/devkit-java-tests/testData/codeInsight/orderAttributeHighlighting.xml b/plugins/devkit/devkit-java-tests/testData/codeInsight/orderAttributeHighlighting.xml
index 4ff97d7c9330..cde36947f42a 100644
--- a/plugins/devkit/devkit-java-tests/testData/codeInsight/orderAttributeHighlighting.xml
+++ b/plugins/devkit/devkit-java-tests/testData/codeInsight/orderAttributeHighlighting.xml
@@ -14,5 +14,12 @@
     <myEp id="id4" order="before id2, after id1"/>
     <myEp id="id5" order="before id2, after <error descr="Cannot resolve 'wrongId' myEp extension">wrongId</error>"/>
     <myEp id="id6" order="before id6, before id5, after id1, before <error descr="Cannot resolve 'wrongId' myEp extension">wrongId</error>"/>
+
+    <myEp id="id7" order="first, after:<error descr="Cannot resolve 'wrongId' myEp extension">wrongId</error>"/>
+    <myEp id="id8" order="first, before:<error descr="Cannot resolve 'wrongId' myEp extension">wrongId</error>"/>
+    <myEp id="id9" order="after:<error descr="Cannot resolve 'wrongId' myEp extension">wrongId</error>"/>
+    <myEp id="id10" order="before:<error descr="Cannot resolve 'wrongId' myEp extension">wrongId</error>"/>
+
+    <myEp id="id11" order="<error descr="Invalid 'order' attribute value">wrongKeyword id6</error>"/>
   </extensions>
 </idea-plugin>
\ No newline at end of file