diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineShape2Tag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineShape2Tag.java
index 2ab8fe7ae..29a5073a1 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineShape2Tag.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineShape2Tag.java
@@ -66,12 +66,12 @@ public class DefineShape2Tag extends ShapeTag {
 
     @Override
     public void getNeededCharacters(Set<Integer> needed) {
-        shapes.getNeededCharacters(needed);
+        getShapes().getNeededCharacters(needed);
     }
 
     @Override
     public boolean removeCharacter(int characterId) {
-        boolean modified = shapes.removeCharacter(characterId);
+        boolean modified = getShapes().removeCharacter(characterId);
         if (modified) {
             setModified(true);
         }
@@ -124,7 +124,7 @@ public class DefineShape2Tag extends ShapeTag {
         try {
             sos.writeUI16(shapeId);
             sos.writeRECT(shapeBounds);
-            sos.writeSHAPEWITHSTYLE(shapes, 2);
+            sos.writeSHAPEWITHSTYLE(getShapes(), 2);
         } catch (IOException e) {
             throw new Error("This should never happen.", e);
         }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineShape3Tag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineShape3Tag.java
index aba844420..4e858f9e1 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineShape3Tag.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineShape3Tag.java
@@ -66,12 +66,12 @@ public class DefineShape3Tag extends ShapeTag {
 
     @Override
     public void getNeededCharacters(Set<Integer> needed) {
-        shapes.getNeededCharacters(needed);
+        getShapes().getNeededCharacters(needed);
     }
 
     @Override
     public boolean removeCharacter(int characterId) {
-        boolean modified = shapes.removeCharacter(characterId);
+        boolean modified = getShapes().removeCharacter(characterId);
         if (modified) {
             setModified(true);
         }
@@ -124,7 +124,7 @@ public class DefineShape3Tag extends ShapeTag {
         try {
             sos.writeUI16(shapeId);
             sos.writeRECT(shapeBounds);
-            sos.writeSHAPEWITHSTYLE(shapes, 3);
+            sos.writeSHAPEWITHSTYLE(getShapes(), 3);
         } catch (IOException e) {
             throw new Error("This should never happen.", e);
         }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineShape4Tag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineShape4Tag.java
index 071afab03..b6b06f8a9 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineShape4Tag.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineShape4Tag.java
@@ -74,12 +74,12 @@ public class DefineShape4Tag extends ShapeTag {
 
     @Override
     public void getNeededCharacters(Set<Integer> needed) {
-        shapes.getNeededCharacters(needed);
+        getShapes().getNeededCharacters(needed);
     }
 
     @Override
     public boolean removeCharacter(int characterId) {
-        boolean modified = shapes.removeCharacter(characterId);
+        boolean modified = getShapes().removeCharacter(characterId);
         if (modified) {
             setModified(true);
         }
@@ -143,7 +143,7 @@ public class DefineShape4Tag extends ShapeTag {
             sos.writeUB(1, usesFillWindingRule ? 1 : 0);
             sos.writeUB(1, usesNonScalingStrokes ? 1 : 0);
             sos.writeUB(1, usesScalingStrokes ? 1 : 0);
-            sos.writeSHAPEWITHSTYLE(shapes, 4);
+            sos.writeSHAPEWITHSTYLE(getShapes(), 4);
         } catch (IOException e) {
             throw new Error("This should never happen.", e);
         }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineShapeTag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineShapeTag.java
index 51010b0fe..2b162451a 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineShapeTag.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineShapeTag.java
@@ -65,12 +65,12 @@ public class DefineShapeTag extends ShapeTag {
 
     @Override
     public void getNeededCharacters(Set<Integer> needed) {
-        shapes.getNeededCharacters(needed);
+        getShapes().getNeededCharacters(needed);
     }
 
     @Override
     public boolean removeCharacter(int characterId) {
-        boolean modified = shapes.removeCharacter(characterId);
+        boolean modified = getShapes().removeCharacter(characterId);
         if (modified) {
             setModified(true);
         }
@@ -117,7 +117,7 @@ public class DefineShapeTag extends ShapeTag {
         try {
             sos.writeUI16(shapeId);
             sos.writeRECT(shapeBounds);
-            sos.writeSHAPEWITHSTYLE(shapes, 1);
+            sos.writeSHAPEWITHSTYLE(getShapes(), 1);
         } catch (IOException e) {
             throw new Error("This should never happen.", e);
         }