diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/FindDocComment.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/FindDocComment.kt
index bb94218272e..a4fcb9b9dda 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/FindDocComment.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/FindDocComment.kt
@@ -21,9 +21,10 @@ import org.jetbrains.kotlin.kdoc.psi.api.KDoc
 import org.jetbrains.kotlin.psi.psiUtil.siblings
 import com.intellij.psi.PsiWhiteSpace
 import com.intellij.psi.PsiComment
+import org.jetbrains.kotlin.psi.psiUtil.allChildren
 
 fun findDocComment(declaration: JetDeclaration): KDoc? {
-    return declaration.getFirstChild().siblings()
+    return declaration.allChildren
             .dropWhile { it !is KDoc && (it is PsiWhiteSpace || it is PsiComment) }
             .first() as? KDoc
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/DataForConversion.kt b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/DataForConversion.kt
index 98236030562..6c8a3963c97 100644
--- a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/DataForConversion.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/DataForConversion.kt
@@ -168,7 +168,7 @@ data class DataForConversion private(
         }
 
         private fun tryClipLeftSide(element: PsiElement, leftBound: Int)
-                = tryClipSide(element, leftBound, { range }, { getFirstChild().siblings() })
+                = tryClipSide(element, leftBound, { range }, { allChildren })
 
         private fun tryClipRightSide(element: PsiElement, rightBound: Int): Int? {
             fun Int.transform() = Int.MAX_VALUE - this