diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/PyRemoveWithTargetQuickFix.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/PyRemoveWithTargetQuickFix.java
index 225eb08024b5..96b93c0b132d 100644
--- a/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/PyRemoveWithTargetQuickFix.java
+++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/PyRemoveWithTargetQuickFix.java
@@ -15,8 +15,8 @@
  */
 package com.jetbrains.python.inspections.quickfix;
 
-import com.intellij.codeInspection.LocalQuickFix;
-import com.intellij.codeInspection.ProblemDescriptor;
+import com.intellij.modcommand.ModPsiUpdater;
+import com.intellij.modcommand.PsiUpdateModCommandQuickFix;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.util.PsiTreeUtil;
@@ -25,7 +25,7 @@ import com.jetbrains.python.psi.PyExpression;
 import com.jetbrains.python.psi.PyWithItem;
 import org.jetbrains.annotations.NotNull;
 
-public class PyRemoveWithTargetQuickFix implements LocalQuickFix {
+public class PyRemoveWithTargetQuickFix extends PsiUpdateModCommandQuickFix {
   @NotNull
   @Override
   public String getFamilyName() {
@@ -33,8 +33,7 @@ public class PyRemoveWithTargetQuickFix implements LocalQuickFix {
   }
 
   @Override
-  public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
-    final PsiElement element = descriptor.getPsiElement();
+  public void applyFix(@NotNull Project project, @NotNull PsiElement element, @NotNull ModPsiUpdater updater) {
     final PyWithItem withItem = PsiTreeUtil.getParentOfType(element, PyWithItem.class);
     if (withItem == null) return;
     final PyExpression withTarget = withItem.getTarget();
diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/PyReplaceStarByUnpackQuickFix.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/PyReplaceStarByUnpackQuickFix.java
index b473d54636ae..b5c478fcf29f 100644
--- a/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/PyReplaceStarByUnpackQuickFix.java
+++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/PyReplaceStarByUnpackQuickFix.java
@@ -1,7 +1,7 @@
 package com.jetbrains.python.inspections.quickfix;
 
-import com.intellij.codeInspection.LocalQuickFix;
-import com.intellij.codeInspection.ProblemDescriptor;
+import com.intellij.modcommand.ModPsiUpdater;
+import com.intellij.modcommand.PsiUpdateModCommandQuickFix;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
@@ -10,7 +10,7 @@ import com.jetbrains.python.psi.PyExpression;
 import com.jetbrains.python.psi.PyStarExpression;
 import org.jetbrains.annotations.NotNull;
 
-public class PyReplaceStarByUnpackQuickFix implements LocalQuickFix {
+public class PyReplaceStarByUnpackQuickFix extends PsiUpdateModCommandQuickFix {
   @NotNull
   @Override
   public String getFamilyName() {
@@ -18,11 +18,9 @@ public class PyReplaceStarByUnpackQuickFix implements LocalQuickFix {
   }
 
   @Override
-  public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
-    PsiElement element = descriptor.getPsiElement();
-    if (!(element instanceof PyStarExpression)) return;
+  public void applyFix(@NotNull Project project, @NotNull PsiElement element, @NotNull ModPsiUpdater updater) {
+    if (!(element instanceof PyStarExpression starExpression)) return;
 
-    PyStarExpression starExpression = (PyStarExpression)element;
     PyExpression expression = starExpression.getExpression();
     if (expression == null) return;
     PsiFile file = starExpression.getContainingFile();