diff --git a/src/java/org/apache/poi/sl/usermodel/AutoShape.java b/src/java/org/apache/poi/sl/usermodel/AutoShape.java
index 5a77bdae4..bea050213 100644
--- a/src/java/org/apache/poi/sl/usermodel/AutoShape.java
+++ b/src/java/org/apache/poi/sl/usermodel/AutoShape.java
@@ -19,6 +19,6 @@ package org.apache.poi.sl.usermodel;
 
 public interface AutoShape<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends TextShape<S,P> {
 }
diff --git a/src/java/org/apache/poi/sl/usermodel/Background.java b/src/java/org/apache/poi/sl/usermodel/Background.java
index 64f3b36a5..879879a20 100644
--- a/src/java/org/apache/poi/sl/usermodel/Background.java
+++ b/src/java/org/apache/poi/sl/usermodel/Background.java
@@ -19,7 +19,7 @@ package org.apache.poi.sl.usermodel;
 
 public interface Background<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends Shape<S,P> {
     FillStyle getFillStyle();
 }
diff --git a/src/java/org/apache/poi/sl/usermodel/ConnectorShape.java b/src/java/org/apache/poi/sl/usermodel/ConnectorShape.java
index e10c7507d..2b580daeb 100644
--- a/src/java/org/apache/poi/sl/usermodel/ConnectorShape.java
+++ b/src/java/org/apache/poi/sl/usermodel/ConnectorShape.java
@@ -19,7 +19,7 @@ package org.apache.poi.sl.usermodel;
 
 public interface ConnectorShape<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends SimpleShape<S,P> {
 
 }
diff --git a/src/java/org/apache/poi/sl/usermodel/FreeformShape.java b/src/java/org/apache/poi/sl/usermodel/FreeformShape.java
index c8ada26f2..2a1580a7d 100644
--- a/src/java/org/apache/poi/sl/usermodel/FreeformShape.java
+++ b/src/java/org/apache/poi/sl/usermodel/FreeformShape.java
@@ -21,7 +21,7 @@ import java.awt.geom.Path2D;
 
 public interface FreeformShape<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends AutoShape<S,P> {
     /**
      * Gets the shape path.
diff --git a/src/java/org/apache/poi/sl/usermodel/GraphicalFrame.java b/src/java/org/apache/poi/sl/usermodel/GraphicalFrame.java
index f8ba1e2c9..def24d959 100644
--- a/src/java/org/apache/poi/sl/usermodel/GraphicalFrame.java
+++ b/src/java/org/apache/poi/sl/usermodel/GraphicalFrame.java
@@ -19,7 +19,7 @@ package org.apache.poi.sl.usermodel;
 
 public interface GraphicalFrame<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends Shape<S,P>, PlaceableShape<S,P> {
 
     /**
diff --git a/src/java/org/apache/poi/sl/usermodel/GroupShape.java b/src/java/org/apache/poi/sl/usermodel/GroupShape.java
index a7545a4d4..31f5be534 100644
--- a/src/java/org/apache/poi/sl/usermodel/GroupShape.java
+++ b/src/java/org/apache/poi/sl/usermodel/GroupShape.java
@@ -21,7 +21,7 @@ import java.awt.geom.Rectangle2D;
 
 public interface GroupShape<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends Shape<S,P>, ShapeContainer<S,P>, PlaceableShape<S,P> {
 
     /**
diff --git a/src/java/org/apache/poi/sl/usermodel/Hyperlink.java b/src/java/org/apache/poi/sl/usermodel/Hyperlink.java
index 3c2a9fc28..381c92899 100644
--- a/src/java/org/apache/poi/sl/usermodel/Hyperlink.java
+++ b/src/java/org/apache/poi/sl/usermodel/Hyperlink.java
@@ -23,7 +23,7 @@ package org.apache.poi.sl.usermodel;
  */
 public interface Hyperlink<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends org.apache.poi.common.usermodel.Hyperlink {
     /**
      * Link to an email
diff --git a/src/java/org/apache/poi/sl/usermodel/Line.java b/src/java/org/apache/poi/sl/usermodel/Line.java
index e9325c55b..d2c2134e5 100644
--- a/src/java/org/apache/poi/sl/usermodel/Line.java
+++ b/src/java/org/apache/poi/sl/usermodel/Line.java
@@ -27,7 +27,7 @@ import org.apache.poi.util.Internal;
 @Internal
 public interface Line<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends AutoShape<S,P> {
 
 }
diff --git a/src/java/org/apache/poi/sl/usermodel/MasterSheet.java b/src/java/org/apache/poi/sl/usermodel/MasterSheet.java
index fdfcf4380..ac23bc3bb 100644
--- a/src/java/org/apache/poi/sl/usermodel/MasterSheet.java
+++ b/src/java/org/apache/poi/sl/usermodel/MasterSheet.java
@@ -19,7 +19,7 @@ package org.apache.poi.sl.usermodel;
 
 public interface MasterSheet<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends Sheet<S,P> {
 
 }
diff --git a/src/java/org/apache/poi/sl/usermodel/Notes.java b/src/java/org/apache/poi/sl/usermodel/Notes.java
index d156e98a7..377ad24c4 100644
--- a/src/java/org/apache/poi/sl/usermodel/Notes.java
+++ b/src/java/org/apache/poi/sl/usermodel/Notes.java
@@ -21,7 +21,7 @@ import java.util.List;
 
 public interface Notes<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends Sheet<S,P> {
 	List<? extends List<P>> getTextParagraphs();
 }
diff --git a/src/java/org/apache/poi/sl/usermodel/PictureShape.java b/src/java/org/apache/poi/sl/usermodel/PictureShape.java
index 671a43946..c7fb62941 100644
--- a/src/java/org/apache/poi/sl/usermodel/PictureShape.java
+++ b/src/java/org/apache/poi/sl/usermodel/PictureShape.java
@@ -21,7 +21,7 @@ import java.awt.Insets;
 
 public interface PictureShape<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends SimpleShape<S,P> {
     /**
      * Returns the picture data for this picture.
diff --git a/src/java/org/apache/poi/sl/usermodel/PlaceableShape.java b/src/java/org/apache/poi/sl/usermodel/PlaceableShape.java
index da1981a04..80d9f0fa5 100644
--- a/src/java/org/apache/poi/sl/usermodel/PlaceableShape.java
+++ b/src/java/org/apache/poi/sl/usermodel/PlaceableShape.java
@@ -21,7 +21,7 @@ import java.awt.geom.Rectangle2D;
 
 public interface PlaceableShape<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > {
     ShapeContainer<S,P> getParent();
     
diff --git a/src/java/org/apache/poi/sl/usermodel/Shadow.java b/src/java/org/apache/poi/sl/usermodel/Shadow.java
index 2c99f32b6..de462f913 100644
--- a/src/java/org/apache/poi/sl/usermodel/Shadow.java
+++ b/src/java/org/apache/poi/sl/usermodel/Shadow.java
@@ -23,7 +23,7 @@ import org.apache.poi.sl.usermodel.PaintStyle.SolidPaint;
 
 public interface Shadow<
 S extends Shape<S,P>,
-P extends TextParagraph<S,P,?>
+P extends TextParagraph<S,P,? extends TextRun>
 > {
     SimpleShape<S,P> getShadowParent();
     
diff --git a/src/java/org/apache/poi/sl/usermodel/Shape.java b/src/java/org/apache/poi/sl/usermodel/Shape.java
index 0115f8b9a..8afc26fcf 100644
--- a/src/java/org/apache/poi/sl/usermodel/Shape.java
+++ b/src/java/org/apache/poi/sl/usermodel/Shape.java
@@ -22,7 +22,7 @@ import java.awt.geom.Rectangle2D;
 
 public interface Shape<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > {
 	ShapeContainer<S,P> getParent();
 
diff --git a/src/java/org/apache/poi/sl/usermodel/ShapeContainer.java b/src/java/org/apache/poi/sl/usermodel/ShapeContainer.java
index 086501b4c..ba02e4b05 100644
--- a/src/java/org/apache/poi/sl/usermodel/ShapeContainer.java
+++ b/src/java/org/apache/poi/sl/usermodel/ShapeContainer.java
@@ -22,7 +22,7 @@ import java.util.List;
 
 public interface ShapeContainer<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends Iterable<S> {
     /**
      * Returns an list containing all of the elements in this container in proper
diff --git a/src/java/org/apache/poi/sl/usermodel/Sheet.java b/src/java/org/apache/poi/sl/usermodel/Sheet.java
index cd2a6f18c..923dac378 100644
--- a/src/java/org/apache/poi/sl/usermodel/Sheet.java
+++ b/src/java/org/apache/poi/sl/usermodel/Sheet.java
@@ -25,7 +25,7 @@ import java.awt.Graphics2D;
  */
 public interface Sheet<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends ShapeContainer<S,P> {
 	SlideShow<S,P> getSlideShow();
 
diff --git a/src/java/org/apache/poi/sl/usermodel/SimpleShape.java b/src/java/org/apache/poi/sl/usermodel/SimpleShape.java
index aee69fb73..7bbbddfd0 100644
--- a/src/java/org/apache/poi/sl/usermodel/SimpleShape.java
+++ b/src/java/org/apache/poi/sl/usermodel/SimpleShape.java
@@ -25,7 +25,7 @@ import org.apache.poi.sl.draw.geom.IAdjustableShape;
 
 public interface SimpleShape<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends Shape<S,P>, IAdjustableShape, PlaceableShape<S,P> {
 
     FillStyle getFillStyle();
diff --git a/src/java/org/apache/poi/sl/usermodel/Slide.java b/src/java/org/apache/poi/sl/usermodel/Slide.java
index 3b2913269..74c9d6b0f 100644
--- a/src/java/org/apache/poi/sl/usermodel/Slide.java
+++ b/src/java/org/apache/poi/sl/usermodel/Slide.java
@@ -19,7 +19,7 @@ package org.apache.poi.sl.usermodel;
 
 public interface Slide<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends Sheet<S,P> {
     Notes<S,P> getNotes();
     void setNotes(Notes<S,P> notes);
diff --git a/src/java/org/apache/poi/sl/usermodel/SlideShow.java b/src/java/org/apache/poi/sl/usermodel/SlideShow.java
index 228925d1c..90d81df3b 100644
--- a/src/java/org/apache/poi/sl/usermodel/SlideShow.java
+++ b/src/java/org/apache/poi/sl/usermodel/SlideShow.java
@@ -29,7 +29,7 @@ import org.apache.poi.sl.usermodel.PictureData.PictureType;
 
 public interface SlideShow<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends Closeable {
 	Slide<S,P> createSlide() throws IOException;
 
diff --git a/src/java/org/apache/poi/sl/usermodel/TableCell.java b/src/java/org/apache/poi/sl/usermodel/TableCell.java
index 1543148d7..4bc5e3327 100644
--- a/src/java/org/apache/poi/sl/usermodel/TableCell.java
+++ b/src/java/org/apache/poi/sl/usermodel/TableCell.java
@@ -24,7 +24,7 @@ import org.apache.poi.sl.usermodel.StrokeStyle.LineDash;
 
 public interface TableCell<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends TextShape<S,P> {
     enum BorderEdge { bottom, left, top, right }
 
diff --git a/src/java/org/apache/poi/sl/usermodel/TableShape.java b/src/java/org/apache/poi/sl/usermodel/TableShape.java
index 7dbb13f00..20f2dc3d7 100644
--- a/src/java/org/apache/poi/sl/usermodel/TableShape.java
+++ b/src/java/org/apache/poi/sl/usermodel/TableShape.java
@@ -19,7 +19,7 @@ package org.apache.poi.sl.usermodel;
 
 public interface TableShape<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends Shape<S,P>, PlaceableShape<S,P> {
     /**
      * Return the maximum number of columns.
diff --git a/src/java/org/apache/poi/sl/usermodel/TextBox.java b/src/java/org/apache/poi/sl/usermodel/TextBox.java
index bc6951103..1405722b8 100644
--- a/src/java/org/apache/poi/sl/usermodel/TextBox.java
+++ b/src/java/org/apache/poi/sl/usermodel/TextBox.java
@@ -26,6 +26,6 @@ package org.apache.poi.sl.usermodel;
  */
 public interface TextBox<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends AutoShape<S,P> {
 }
diff --git a/src/java/org/apache/poi/sl/usermodel/TextShape.java b/src/java/org/apache/poi/sl/usermodel/TextShape.java
index e480e5645..934260743 100644
--- a/src/java/org/apache/poi/sl/usermodel/TextShape.java
+++ b/src/java/org/apache/poi/sl/usermodel/TextShape.java
@@ -23,7 +23,7 @@ import java.util.List;
 
 public interface TextShape<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends SimpleShape<S,P>, Iterable<P>  {
     /**
      * Vertical Text Types
@@ -159,7 +159,7 @@ public interface TextShape<
     /**
      * @return the TextParagraphs for this text box
      */
-    List<? extends TextParagraph<S,P,?>> getTextParagraphs();
+    List<P> getTextParagraphs();
 
     /**
      * @return text shape margin
diff --git a/src/ooxml/testcases/org/apache/poi/sl/TestFonts.java b/src/ooxml/testcases/org/apache/poi/sl/TestFonts.java
index d6e83130f..099813c01 100644
--- a/src/ooxml/testcases/org/apache/poi/sl/TestFonts.java
+++ b/src/ooxml/testcases/org/apache/poi/sl/TestFonts.java
@@ -147,7 +147,7 @@ public class TestFonts {
         // TODO: set east asian font family - MS Office uses "MS Mincho" or "MS Gothic" as a fallback
         // see https://stackoverflow.com/questions/26063828 for good explanation about the font metrics
         // differences on different environments
-        for (TextParagraph<?,?,?> p : tb.getTextParagraphs()) {
+        for (TextParagraph<?,?,? extends TextRun> p : tb.getTextParagraphs()) {
             for (TextRun r : p.getTextRuns()) {
                 r.setFontFamily(fontFamily, fontGroup);
             }