diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
index 156081861..4808369f1 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
@@ -1389,7 +1389,7 @@ public final class SWF implements TreeItem, Timelined {
                 fos.write(Utf8Helper.getBytes(((FontTag) ch).toHtmlCanvas(1)));
                 fos.write(Utf8Helper.getBytes("}\r\n\r\n"));
             } else {
-                fos.write(Utf8Helper.getBytes("function " + getTypePrefix(ch) + c + "(ctx,ctrans,frame,ratio,time){\r\n"));
+                
                 if (ch instanceof ImageTag) {
                     ImageTag image = (ImageTag) ch;
                     String format = image.getImageFormat();
@@ -1408,10 +1408,11 @@ public final class SWF implements TreeItem, Timelined {
                     String base64ImgData = DatatypeConverter.printBase64Binary(imageData);
                     fos.write(Utf8Helper.getBytes("var imageObj" + c + " = document.createElement(\"img\");\r\nimageObj" + c + ".src=\"data:image/" + format + ";base64," + base64ImgData + "\";\r\n"));
                 }
+                fos.write(Utf8Helper.getBytes("function " + getTypePrefix(ch) + c + "(ctx,ctrans,frame,ratio,time){\r\n"));
                 if (ch instanceof DrawableTag) {
                     fos.write(Utf8Helper.getBytes(((DrawableTag) ch).toHtmlCanvas(1)));
                 }
-                fos.write(Utf8Helper.getBytes("}\r\n\r\n"));
+                fos.write(Utf8Helper.getBytes("}\r\n\r\n"));                
             }
         }
     }
@@ -2290,7 +2291,7 @@ public final class SWF implements TreeItem, Timelined {
                     sb.append("\t\t\tctx.globalCompositeOperation = \"destination-in\";\r\n");
                     sb.append("\t\t\tctx.setTransform(1,0,0,1,0,0);\r\n");
                     sb.append("\t\t\tctx.drawImage(o.clipCanvas,0,0);\r\n");
-                    sb.append("\t\t\tvar ms=o.ctx._matrices.slice();\r\n");
+                    sb.append("\t\t\tvar ms=o.ctx._matrix;\r\n");
                     sb.append("\t\t\to.ctx.setTransform(1,0,0,1,0,0);\r\n");
                     sb.append("\t\t\to.ctx.globalCompositeOperation = \"source-over\";\r\n");
                     sb.append("\t\t\to.ctx.drawImage(canvas,0,0);\r\n");
@@ -2338,7 +2339,7 @@ public final class SWF implements TreeItem, Timelined {
                     sb.append("\t\t\tvar ccanvas = createCanvas(canvas.width,canvas.height);\r\n");
                     sb.append("\t\t\tvar cctx = ccanvas.getContext(\"2d\");\r\n");
                     sb.append("\t\t\tenhanceContext(cctx);\r\n");
-                    sb.append("\t\t\tcctx.applyTransforms(ctx._matrices);\r\n");
+                    sb.append("\t\t\tcctx.applyTransforms(ctx._matrix);\r\n");
                     sb.append("\t\t\tcanvas = ccanvas;\r\n");
                     sb.append("\t\t\tctx = cctx;\r\n");
                 }
@@ -2348,7 +2349,7 @@ public final class SWF implements TreeItem, Timelined {
                     sb.append("\t\t\tvar fcanvas = createCanvas(canvas.width,canvas.height);");
                     sb.append("\t\t\tvar fctx = fcanvas.getContext(\"2d\");\r\n");
                     sb.append("\t\t\tenhanceContext(fctx);\r\n");
-                    sb.append("\t\t\tfctx.applyTransforms(ctx._matrices);\r\n");
+                    sb.append("\t\t\tfctx.applyTransforms(ctx._matrix);\r\n");
                     sb.append("\t\t\tctx = fctx;\r\n");
                 }
 
@@ -2474,7 +2475,7 @@ public final class SWF implements TreeItem, Timelined {
                         }
                     }
                     sb.append("\t\t\tctx = oldctx;\r\n");
-                    sb.append("\t\t\tvar ms=ctx._matrices;\r\n");
+                    sb.append("\t\t\tvar ms=ctx._matrix;\r\n");
                     sb.append("\t\t\tctx.setTransform(1,0,0,1,0,0);\r\n");
                     sb.append("\t\t\tctx.drawImage(fcanvas,0,0);\r\n");
                     sb.append("\t\t\tctx.applyTransforms(ms);\r\n");
@@ -2485,7 +2486,7 @@ public final class SWF implements TreeItem, Timelined {
                     sb.append("\t\t\tcanvas = createCanvas(canvas.width,canvas.height);\r\n");
                     sb.append("\t\t\tvar nctx = canvas.getContext(\"2d\");\r\n");
                     sb.append("\t\t\tenhanceContext(nctx);\r\n");
-                    sb.append("\t\t\tnctx.applyTransforms(ctx._matrices);\r\n");
+                    sb.append("\t\t\tnctx.applyTransforms(ctx._matrix);\r\n");
                     sb.append("\t\t\tctx = nctx;\r\n");
                 }
             }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/morphshape/CanvasMorphShapeExporter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/morphshape/CanvasMorphShapeExporter.java
index 20dee20f0..5e44b3ac7 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/morphshape/CanvasMorphShapeExporter.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/morphshape/CanvasMorphShapeExporter.java
@@ -252,7 +252,7 @@ public class CanvasMorphShapeExporter extends MorphShapeExporterBase {
 
                 }
 
-                fillData += "\tvar fimg = ctrans.applyToImage(image" + bitmapId + ");\r\n";
+                fillData += "\tvar fimg = ctrans.applyToImage(imageObj" + bitmapId + ");\r\n";
                 fillData += "\tvar pat=ctx.createPattern(fimg,\"repeat\");\r\n";
                 fillData += "\tctx.fillStyle = pat;\r\n";
             }
@@ -473,6 +473,7 @@ public class CanvasMorphShapeExporter extends MorphShapeExporterBase {
                 pathData += strokeData;
             }
             if (fillMatrix != null) {
+                pathData += drawFill;
                 if (lastRadColor != null) {
                     pathData += "\tctx.fillStyle=" + lastRadColor + ";\r\n\tctx.fill(\"evenodd\");\r\n";
                 }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/CanvasShapeExporter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/CanvasShapeExporter.java
index d2f13538b..ef479836e 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/CanvasShapeExporter.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/CanvasShapeExporter.java
@@ -464,6 +464,7 @@ public class CanvasShapeExporter extends ShapeExporterBase {
                 pathData += strokeData;
             }
             if (fillMatrix != null) {
+                pathData += drawFill;
                 if (lastRadColor != null) {
                     pathData += "\tctx.fillStyle=" + lastRadColor + ";\r\n\tctx.fill(\"evenodd\");\r\n";
                 }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/helpers/resource/canvas.js b/libsrc/ffdec_lib/src/com/jpexs/helpers/resource/canvas.js
index f66d21ecb..087800364 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/helpers/resource/canvas.js
+++ b/libsrc/ffdec_lib/src/com/jpexs/helpers/resource/canvas.js
@@ -822,7 +822,7 @@ var enhanceContext = function(context) {
             super_.translate.call(this, x, y);
         },
         transform: function(a, b, c, d, e, f) {
-            this._matrix = concatMatrix(this._matrix,[a,b,c,d,e,f]);
+            this._matrix = concatMatrix([a,b,c,d,e,f],this._matrix);
             super_.transform.call(this, a, b, c, d, e, f);
         },
         setTransform: function(a, b, c, d, e, f) {
@@ -837,8 +837,8 @@ var enhanceContext = function(context) {
         },  
         applyTransformToPoint: function(p){
             var ret = {};
-            ret.x = this._matrix[0]*p.x + this._matrix[1]*p.y + this._matrix[4];
-            ret.y = this._matrix[2]*p.x + this._matrix[3]*p.y + this._matrix[5];                
+            ret.x = this._matrix[0]*p.x + this._matrix[2]*p.y + this._matrix[4];
+            ret.y = this._matrix[1]*p.x + this._matrix[3]*p.y + this._matrix[5];                
             return ret;
         },
         __proto__: super_
@@ -906,7 +906,7 @@ var place = function(obj, canvas, ctx, matrix, ctrans, blendMode, frame, ratio,
         var ncanvas = createCanvas(canvas.width, canvas.height);
         ctx = ncanvas.getContext("2d");
         enhanceContext(ctx);
-        ctx.applyTransforms(oldctx._matrices);
+        ctx.applyTransforms(oldctx._matrix);
     }
     if (blendMode > 1) {
         eval(obj + "(ctx,new cxform(0,0,0,0,255,255,255,255),frame,ratio,time);");
@@ -1021,7 +1021,7 @@ function drawMorphPath(ctx, p, ratio, doStroke, scaleMode){
         
         ctx.save();        
         ctx.setTransform(1,0,0,1,0,0);        
-    }    
+    }  
     ctx.beginPath();    
     var drawCommand = "";
     for (var i = 0; i < len; i++) {