diff --git a/plugins/generate-tostring/src/org/jetbrains/java/generate/template/TemplateResource.java b/plugins/generate-tostring/src/org/jetbrains/java/generate/template/TemplateResource.java
index 66bbc40ce690..07547226c8a5 100644
--- a/plugins/generate-tostring/src/org/jetbrains/java/generate/template/TemplateResource.java
+++ b/plugins/generate-tostring/src/org/jetbrains/java/generate/template/TemplateResource.java
@@ -122,7 +122,7 @@ public class TemplateResource implements Serializable {
    */
   @Nullable
   public String getJavaDoc() {
-    int i = template.indexOf("*/");
+    int i = template.trim().startsWith("/*") ? template.indexOf("*/") : -1;
     if (i == -1) {
       return null;
     }
@@ -163,7 +163,8 @@ public class TemplateResource implements Serializable {
   }
 
   private static String getMethodSignature(String template) {
-    String s = after(template, "*/").trim();
+    final String trimmed = template.trim();
+    String s = trimmed.startsWith("/*") ? after(trimmed, "*/") : trimmed;
 
     StringBuffer signature = new StringBuffer();