diff --git a/compiler/frontend.common-psi/src/org/jetbrains/kotlin/diagnostics/LightTreePositioningStrategy.kt b/compiler/frontend.common-psi/src/org/jetbrains/kotlin/diagnostics/LightTreePositioningStrategy.kt
index d5d030b2685..f2b1d6fe77e 100644
--- a/compiler/frontend.common-psi/src/org/jetbrains/kotlin/diagnostics/LightTreePositioningStrategy.kt
+++ b/compiler/frontend.common-psi/src/org/jetbrains/kotlin/diagnostics/LightTreePositioningStrategy.kt
@@ -6,7 +6,6 @@
 package org.jetbrains.kotlin.diagnostics
 
 import com.intellij.lang.LighterASTNode
-import com.intellij.openapi.util.Ref
 import com.intellij.openapi.util.TextRange
 import com.intellij.psi.TokenType
 import com.intellij.util.diff.FlyweightCapableTreeStructure
@@ -107,7 +106,7 @@ val KtLightSourceElement.startOffsetSkippingComments: Int
 
         // The solution to find first non comment children will not work here. `treeStructure` can have different root
         // than original program. Because of that `startOffset` is relative and not in absolute value.
-        val comments = children.takeWhile { it.tokenType in DOC_AND_COMMENT_TOKENS }
+        val comments = children.takeWhile { it.tokenType in FILLER_TOKENS }
         return startOffset + comments.sumOf { it.textLength }
     }