diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/FontNormalizer.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/FontNormalizer.java
index 6ea995584..80a4a31b9 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/FontNormalizer.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/FontNormalizer.java
@@ -390,7 +390,7 @@ public class FontNormalizer {
     private Set<Integer> getDefineEditTextFonts(DefineEditTextTag text) {
         Set<Integer> ret = new LinkedHashSet<>();
         TextStyle style = new TextStyle();
-        if (text.fontClass != null) {
+        if (text.hasFontClass) {
             style.font = text.getSwf().getFontByClass(text.fontClass);
         } else {
             style.font = text.getSwf().getFont(text.fontId);
@@ -513,7 +513,7 @@ public class FontNormalizer {
     private void scaleDefineEditTextFonts(DefineEditTextTag text, Map<Integer, Double> fontNewScale, boolean inPlace, Map<Integer, TextTag> outTexts) {
         String str = "";
         TextStyle style = new TextStyle();
-        if (text.fontClass != null) {
+        if (text.hasFontClass) {
             style.font = text.getSwf().getFontByClass(text.fontClass);
         } else {
             style.font = text.getSwf().getFont(text.fontId);
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/XamlExporter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/XamlExporter.java
index 5dd3f75bf..4033c3fad 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/XamlExporter.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/XamlExporter.java
@@ -402,7 +402,7 @@ public class XamlExporter {
                     int fontId = defineEditText.fontId;
                     FontTag font = null;
                     if (fontId == -1) {
-                        if (defineEditText.fontClass != null) {
+                        if (defineEditText.hasFontClass) {
                             font = swf.getFontByClass(defineEditText.fontClass);
                             fontId = swf.getCharacterId(font);
                         }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineEditTextTag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineEditTextTag.java
index a9ccad1b9..667a2e59b 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineEditTextTag.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineEditTextTag.java
@@ -538,7 +538,7 @@ public class DefineEditTextTag extends TextTag {
         }
         String str = "";
         TextStyle style = new TextStyle();
-        if (fontClass != null) {
+        if (hasFontClass) {
             style.font = swf.getFontByClass(fontClass);
         } else {
             style.font = swf.getFont(fontId);
@@ -1607,8 +1607,8 @@ public class DefineEditTextTag extends TextTag {
             for (SameStyleTextRecord tr : line) {
                 AdvancedTextRecord tr2 = new AdvancedTextRecord();
                 int fid = fontId;
-                if (fontClass != null) {
-                    tr2.fontClass = fontClass;
+                if (hasFontClass) {
+                    tr2.fontClass = fontClass; //FIXME?
                 }
                 if (tr.style.font != null) {
                     fid = swf.getCharacterId(tr.style.font);