diff --git a/modules/javafx.graphics/src/main/java/com/sun/prism/j2d/J2DPrismGraphics.java b/modules/javafx.graphics/src/main/java/com/sun/prism/j2d/J2DPrismGraphics.java
index 2fb30290deb..5b3494dc6fa 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/prism/j2d/J2DPrismGraphics.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/prism/j2d/J2DPrismGraphics.java
@@ -736,10 +736,9 @@ void fill(java.awt.Shape shape) {
                 tmpAT.setTransform(at);
                 try {
                     tmpAT.invert();
+                    g2d.fill(tmpAT.createTransformedShape(shape));
                 } catch (NoninvertibleTransformException e) {
                 }
-
-                g2d.fill(tmpAT.createTransformedShape(shape));
                 setTransform(transform);
                 setClipRect(clipRect);
                 return;
diff --git a/modules/javafx.web/src/main/java/com/sun/javafx/webkit/prism/WCGraphicsPrismContext.java b/modules/javafx.web/src/main/java/com/sun/javafx/webkit/prism/WCGraphicsPrismContext.java
index bd0fddd2fca..22843ac4511 100644
--- a/modules/javafx.web/src/main/java/com/sun/javafx/webkit/prism/WCGraphicsPrismContext.java
+++ b/modules/javafx.web/src/main/java/com/sun/javafx/webkit/prism/WCGraphicsPrismContext.java
@@ -787,7 +787,7 @@ public void drawPattern(
                     double m[] = patternTransform.getMatrix();
                     Affine3D at = new Affine3D();
                     at.translate(phase.getX(), phase.getY());
-                    at.concatenate(m[0], -m[1], m[4], -m[2], m[3], m[5]);
+                    at.concatenate(m[0], m[2], m[4], m[1], m[3], m[5]);
 
                     g.setPaint(new ImagePattern(
                                img,