diff --git a/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaWalker.java b/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaWalker.java
index aba049f9b0d7..fe099762cedd 100644
--- a/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaWalker.java
+++ b/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaWalker.java
@@ -99,7 +99,8 @@ public class JsonSchemaWalker {
           }
         }
         if (selectedSchema != null) {
-          queue.add(Pair.create(selectedSchema, pair.getSecond() + 1));
+          if ((pair.getSecond() + 1) >= position.size()) consumer.consume(isName, selectedSchema);
+          else queue.add(Pair.create(selectedSchema, pair.getSecond() + 1));
         }
       } else {
         List<JsonSchemaObject> list = new ArrayList<>();