diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StaticCallOnSubclassInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StaticCallOnSubclassInspection.java
index 237ec31f748c..bc4f19d6033f 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StaticCallOnSubclassInspection.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StaticCallOnSubclassInspection.java
@@ -61,8 +61,7 @@ public class StaticCallOnSubclassInspection extends BaseInspection {
     @Override
     @NotNull
     public String getName() {
-      return InspectionGadgetsBundle.message(
-        "static.method.via.subclass.rationalize.quickfix");
+      return InspectionGadgetsBundle.message("static.method.via.subclass.rationalize.quickfix");
     }
     @Override
     @NotNull
@@ -73,15 +72,12 @@ public class StaticCallOnSubclassInspection extends BaseInspection {
     @Override
     public void doFix(Project project, ProblemDescriptor descriptor)
       throws IncorrectOperationException {
-      final PsiIdentifier name =
-        (PsiIdentifier)descriptor.getPsiElement();
-      final PsiReferenceExpression expression =
-        (PsiReferenceExpression)name.getParent();
+      final PsiIdentifier name = (PsiIdentifier)descriptor.getPsiElement();
+      final PsiReferenceExpression expression = (PsiReferenceExpression)name.getParent();
       if (expression == null) {
         return;
       }
-      final PsiMethodCallExpression call =
-        (PsiMethodCallExpression)expression.getParent();
+      final PsiMethodCallExpression call = (PsiMethodCallExpression)expression.getParent();
       final String methodName = expression.getReferenceName();
       if (call == null) {
         return;
@@ -95,11 +91,9 @@ public class StaticCallOnSubclassInspection extends BaseInspection {
       if (containingClass == null) {
         return;
       }
-      final String containingClassName =
-        containingClass.getQualifiedName();
+      final String containingClassName = containingClass.getQualifiedName();
       final String argText = argumentList.getText();
-      PsiReplacementUtil.replaceExpressionAndShorten(call, containingClassName + '.' +
-                                                           methodName + argText);
+      PsiReplacementUtil.replaceExpressionAndShorten(call, containingClassName + '.' + call.getTypeArgumentList().getText() + methodName + argText);
     }
   }
 
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/bugs/staticCallOnSubclass/preserveTypeArgs.after.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/bugs/staticCallOnSubclass/preserveTypeArgs.after.java
new file mode 100644
index 000000000000..f4b6308422c8
--- /dev/null
+++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/bugs/staticCallOnSubclass/preserveTypeArgs.after.java
@@ -0,0 +1,11 @@
+class Super {
+  static <T> void foo() {}
+}
+
+class Child extends Super {}
+
+class Bar {
+  {
+      Super.<String>foo();
+  }
+}
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/bugs/staticCallOnSubclass/preserveTypeArgs.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/bugs/staticCallOnSubclass/preserveTypeArgs.java
new file mode 100644
index 000000000000..2bc5fcc44f6f
--- /dev/null
+++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/bugs/staticCallOnSubclass/preserveTypeArgs.java
@@ -0,0 +1,11 @@
+class Super {
+  static <T> void foo() {}
+}
+
+class Child extends Super {}
+
+class Bar {
+  {
+    Child.<String>f<caret>oo();
+  }
+}
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/bugs/StaticCallOnSubclassTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/bugs/StaticCallOnSubclassTest.java
new file mode 100644
index 000000000000..4f20a75059e7
--- /dev/null
+++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/bugs/StaticCallOnSubclassTest.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.siyeh.ig.fixes.bugs;
+
+import com.siyeh.InspectionGadgetsBundle;
+import com.siyeh.ig.IGQuickFixesTestCase;
+import com.siyeh.ig.bugs.CastConflictsWithInstanceofInspection;
+import com.siyeh.ig.bugs.StaticCallOnSubclassInspection;
+
+public class StaticCallOnSubclassTest extends IGQuickFixesTestCase {
+  @Override
+  public void setUp() throws Exception {
+    super.setUp();
+    myFixture.enableInspections(new StaticCallOnSubclassInspection());
+  }
+
+  public void testPreserveTypeArgs() {
+    doTest("preserveTypeArgs", InspectionGadgetsBundle.message("static.method.via.subclass.rationalize.quickfix"));
+  }
+
+  @Override
+  protected String getRelativePath() {
+    return "bugs/staticCallOnSubclass";
+  }
+}