diff --git a/platform/execution-impl/src/com/intellij/execution/impl/TokenBuffer.java b/platform/execution-impl/src/com/intellij/execution/impl/TokenBuffer.java
index d1b9f1ada500..7f93ca2cdc38 100644
--- a/platform/execution-impl/src/com/intellij/execution/impl/TokenBuffer.java
+++ b/platform/execution-impl/src/com/intellij/execution/impl/TokenBuffer.java
@@ -104,10 +104,10 @@ final class TokenBuffer {
     // toss tokens from the beginning until size became < maxCapacity
     while (size - startIndex > maxCapacity) {
       TokenInfo info = tokens.getFirst();
-      int length = info.length() - startIndex;
-      if (length > size - maxCapacity - startIndex) {
+      int length = info.length();
+      if (length > size - maxCapacity) {
         // slice a part of this info
-        startIndex += size - maxCapacity - startIndex;
+        startIndex = size - maxCapacity;
         break;
       }
       startIndex = 0;