diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineMorphShapeTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineMorphShapeTag.java
index 1a40c22aa..a67b4b8c1 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineMorphShapeTag.java
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineMorphShapeTag.java
@@ -187,10 +187,11 @@ public class DefineMorphShapeTag extends CharacterTag implements BoundedTag, Mor
             SHAPERECORD edge1 = startEdges.shapeRecords.get(startIndex);
             SHAPERECORD edge2 = endEdges.shapeRecords.get(startIndex);
             if (edge1 instanceof StyleChangeRecord || edge2 instanceof StyleChangeRecord) {
-                StyleChangeRecord scr1 = (StyleChangeRecord) startEdges.shapeRecords.get(startIndex);
-                StyleChangeRecord scr2 = (StyleChangeRecord) startEdges.shapeRecords.get(startIndex);
+                StyleChangeRecord scr1 = (StyleChangeRecord) edge1;
+                StyleChangeRecord scr2 = (StyleChangeRecord) edge2;
                 StyleChangeRecord scr = (StyleChangeRecord) scr1.clone();
-                if (scr1.stateMoveTo) {
+                if (scr1.stateMoveTo || scr2.stateMoveTo) {
+                    scr.stateMoveTo = true;
                     scr.moveDeltaX = scr1.moveDeltaX + (scr2.moveDeltaX - scr1.moveDeltaX) * frame / 65535;
                     scr.moveDeltaY = scr1.moveDeltaY + (scr2.moveDeltaY - scr1.moveDeltaY) * frame / 65535;
                 }
@@ -249,7 +250,6 @@ public class DefineMorphShapeTag extends CharacterTag implements BoundedTag, Mor
                 finalRecords.add(ser);
             }
         }
-        finalRecords.add(new EndShapeRecord());
         SHAPEWITHSTYLE shape = new SHAPEWITHSTYLE();
         shape.fillStyles = fillStyles;
         shape.lineStyles = lineStyles;
diff --git a/trunk/src/com/jpexs/helpers/SerializableImage.java b/trunk/src/com/jpexs/helpers/SerializableImage.java
index 65c065b72..392035912 100644
--- a/trunk/src/com/jpexs/helpers/SerializableImage.java
+++ b/trunk/src/com/jpexs/helpers/SerializableImage.java
@@ -69,11 +69,11 @@ public class SerializableImage implements Serializable {
     }
 
     public BufferedImage getBufferedImage() {
-        try {
+        /*try {
             ImageIO.write(image, "png", new File("c:\\10\\x\\imageid" + String.format("%03d", imageid++) + ".png"));
         } catch (IOException ex) {
             Logger.getLogger(BitmapExporter.class.getName()).log(Level.SEVERE, null, ex);
-        }
+        }*/
         return image;
     }