diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/DynamicRegexReplaceableByCompiledPatternInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/DynamicRegexReplaceableByCompiledPatternInspection.java
index f6d38a0a16c6..d007f075b98d 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/DynamicRegexReplaceableByCompiledPatternInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/DynamicRegexReplaceableByCompiledPatternInspection.java
@@ -22,6 +22,7 @@ import com.intellij.psi.*;
 import com.siyeh.InspectionGadgetsBundle;
 import com.siyeh.ig.InspectionGadgetsFix;
 import com.siyeh.ig.psiutils.ClassUtils;
+import com.siyeh.ig.psiutils.CommentTracker;
 import com.siyeh.ig.psiutils.HighlightUtils;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -60,11 +61,12 @@ public class DynamicRegexReplaceableByCompiledPatternInspection extends DynamicR
       final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)grandParent;
       final PsiExpressionList list = methodCallExpression.getArgumentList();
       final PsiExpression[] expressions = list.getExpressions();
+      CommentTracker commentTracker = new CommentTracker();
       @NonNls final StringBuilder fieldText =
         new StringBuilder("private static final java.util.regex.Pattern PATTERN = java.util.regex.Pattern.compile(");
       final int expressionsLength = expressions.length;
       if (expressionsLength > 0) {
-        fieldText.append(expressions[0].getText());
+        fieldText.append(commentTracker.markUnchanged(expressions[0]).getText());
       }
       @NonNls final String methodName = methodExpression.getReferenceName();
       final boolean literalReplacement = "replace".equals(methodName);
@@ -75,13 +77,13 @@ public class DynamicRegexReplaceableByCompiledPatternInspection extends DynamicR
 
       @NonNls final StringBuilder expressionText = new StringBuilder("PATTERN.");
       final PsiExpression qualifier = methodExpression.getQualifierExpression();
-      @NonNls final String qualifierText = (qualifier == null) ? "this" : qualifier.getText();
+      @NonNls final String qualifierText = (qualifier == null) ? "this" : commentTracker.markUnchanged(qualifier).getText();
       if ("split".equals(methodName)) {
         expressionText.append(methodName);
         expressionText.append('(');
         expressionText.append(qualifierText);
         for (int i = 1; i < expressionsLength; i++) {
-          expressionText.append(',').append(expressions[i].getText());
+          expressionText.append(',').append(commentTracker.markUnchanged(expressions[i]).getText());
         }
         expressionText.append(')');
       }
@@ -98,9 +100,9 @@ public class DynamicRegexReplaceableByCompiledPatternInspection extends DynamicR
           expressionText.append("java.util.regex.Matcher.quoteReplacement(");
         }
         if (expressionsLength > 1) {
-          expressionText.append(expressions[1].getText());
+          expressionText.append(commentTracker.markUnchanged(expressions[1]).getText());
           for (int i = 2; i < expressionsLength; i++) {
-            expressionText.append(',').append(expressions[i].getText());
+            expressionText.append(',').append(commentTracker.markUnchanged(expressions[i]).getText());
           }
         }
         if (literalReplacement) {
@@ -110,10 +112,8 @@ public class DynamicRegexReplaceableByCompiledPatternInspection extends DynamicR
       }
 
       final PsiElementFactory factory = JavaPsiFacade.getElementFactory(project);
-      final PsiField newField = factory.createFieldFromText(fieldText.toString(), element);
-      final PsiElement field = aClass.add(newField);
-      final PsiExpression newExpression = factory.createExpressionFromText(expressionText.toString(), element);
-      PsiMethodCallExpression newMethodCallExpression = (PsiMethodCallExpression)methodCallExpression.replace(newExpression);
+      final PsiElement field = aClass.add(factory.createFieldFromText(fieldText.toString(), element));
+      PsiMethodCallExpression newMethodCallExpression = (PsiMethodCallExpression)commentTracker.replaceAndRestoreComments(methodCallExpression, expressionText.toString());
       newMethodCallExpression = CodeInsightUtilCore.forcePsiPostprocessAndRestoreElement(newMethodCallExpression);
       final PsiReferenceExpression reference = getReference(newMethodCallExpression);
       HighlightUtils.showRenameTemplate(aClass, (PsiNameIdentifierOwner)field, reference);
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/performance/replace_with_compiled_pattern/Literal.after.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/performance/replace_with_compiled_pattern/Literal.after.java
index 14e83885c160..b8322b769db3 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igfixes/performance/replace_with_compiled_pattern/Literal.after.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/performance/replace_with_compiled_pattern/Literal.after.java
@@ -6,6 +6,6 @@ class Literal {
     private static final Pattern ABC = Pattern.compile("abc", Pattern.LITERAL);
 
     void f(String text, String replacement) {
-        ABC.matcher(text).replaceAll(Matcher.quoteReplacement(replacement));
+        ABC.matcher(text).replaceAll(Matcher.quoteReplacement(replacement));//end line comment
     }
 }
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/performance/replace_with_compiled_pattern/Literal.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/performance/replace_with_compiled_pattern/Literal.java
index 492e8ca19207..490b83d51d52 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igfixes/performance/replace_with_compiled_pattern/Literal.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/performance/replace_with_compiled_pattern/Literal.java
@@ -1,6 +1,6 @@
 class Literal {
 
     void f(String text, String replacement) {
-        text.replace<caret>("abc", replacement);
+        text.replace<caret>("abc", replacement);//end line comment
     }
 }
\ No newline at end of file