diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdatePsiFileCopyright.java b/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdatePsiFileCopyright.java
index 2948457d363f..1ee15cc08c09 100644
--- a/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdatePsiFileCopyright.java
+++ b/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdatePsiFileCopyright.java
@@ -92,6 +92,10 @@ public abstract class UpdatePsiFileCopyright extends AbstractUpdateCopyright {
   }
 
   protected void collectComments(PsiElement first, PsiElement last, List<PsiComment> comments) {
+    if (first == last && first instanceof PsiComment) {
+      comments.add((PsiComment)first);
+      return;
+    }
     PsiElement elem = first;
     while (elem != last && elem != null) {
       if (elem instanceof PsiComment) {