diff --git a/trunk/src/com/jpexs/asdec/SWF.java b/trunk/src/com/jpexs/asdec/SWF.java
index 9d63712bf..e79ce64eb 100644
--- a/trunk/src/com/jpexs/asdec/SWF.java
+++ b/trunk/src/com/jpexs/asdec/SWF.java
@@ -38,6 +38,10 @@ import java.util.zip.InflaterInputStream;
  */
 public class SWF {
 
+   /**
+    * Default version of SWF file format
+    */
+   public static final int DEFAULT_VERSION = 10;
    /**
     * Tags inside of file
     */
@@ -335,11 +339,11 @@ public class SWF {
                   informListeners("export", "Exporting " + f + " ...");
                   String ret;
                   if (isPcode) {
-                     ret = ((ASMSource) node.tag).getASMSource(10); //TODO:Ensure correct version here
+                     ret = ((ASMSource) node.tag).getASMSource(SWF.DEFAULT_VERSION);
                   } else {
-                     List<com.jpexs.asdec.action.Action> as = ((ASMSource) node.tag).getActions(10);//TODO:Ensure correct version here
-                     com.jpexs.asdec.action.Action.setActionsAddresses(as, 0, 10);//TODO:Ensure correct version here
-                     ret = (Highlighting.stripHilights(com.jpexs.asdec.action.Action.actionsToSource(as, 10))); //TODO:Ensure correct version here
+                     List<com.jpexs.asdec.action.Action> as = ((ASMSource) node.tag).getActions(SWF.DEFAULT_VERSION);
+                     com.jpexs.asdec.action.Action.setActionsAddresses(as, 0, SWF.DEFAULT_VERSION);
+                     ret = (Highlighting.stripHilights(com.jpexs.asdec.action.Action.actionsToSource(as, SWF.DEFAULT_VERSION)));
                   }
 
 
diff --git a/trunk/src/com/jpexs/asdec/action/Action.java b/trunk/src/com/jpexs/asdec/action/Action.java
index a76d1b724..ff3e8b14b 100644
--- a/trunk/src/com/jpexs/asdec/action/Action.java
+++ b/trunk/src/com/jpexs/asdec/action/Action.java
@@ -87,7 +87,7 @@ public class Action {
       "_xmouse",
       "_ymouse"
    };
-
+   
    /**
     * Constructor
     *
diff --git a/trunk/src/com/jpexs/asdec/action/gui/MainFrame.java b/trunk/src/com/jpexs/asdec/action/gui/MainFrame.java
index f73db50b5..afa516822 100644
--- a/trunk/src/com/jpexs/asdec/action/gui/MainFrame.java
+++ b/trunk/src/com/jpexs/asdec/action/gui/MainFrame.java
@@ -18,6 +18,7 @@ package com.jpexs.asdec.action.gui;
 
 import com.jpexs.asdec.Configuration;
 import com.jpexs.asdec.Main;
+import com.jpexs.asdec.SWF;
 import com.jpexs.asdec.action.TagNode;
 import com.jpexs.asdec.action.parser.ASMParser;
 import com.jpexs.asdec.action.parser.ParseException;
@@ -216,12 +217,12 @@ public class MainFrame extends JFrame implements TreeSelectionListener, ActionLi
             (new Thread() {
                @Override
                public void run() {
-                  editor.setText(asm.getASMSource(10)); //TODO:Ensure correct version here
+                  editor.setText(asm.getASMSource(SWF.DEFAULT_VERSION));
                   if (Main.DO_DECOMPILE) {
-                     List<com.jpexs.asdec.action.Action> as = asm.getActions(10);//TODO:Ensure correct version here
-                     com.jpexs.asdec.action.Action.setActionsAddresses(as, 0, 10);//TODO:Ensure correct version here
+                     List<com.jpexs.asdec.action.Action> as = asm.getActions(SWF.DEFAULT_VERSION);
+                     com.jpexs.asdec.action.Action.setActionsAddresses(as, 0, SWF.DEFAULT_VERSION);
 
-                     decompiledEditor.setText(Highlighting.stripHilights(com.jpexs.asdec.action.Action.actionsToSource(as, 10))); //TODO:Ensure correct version here
+                     decompiledEditor.setText(Highlighting.stripHilights(com.jpexs.asdec.action.Action.actionsToSource(as, SWF.DEFAULT_VERSION))); 
                   }
                   Main.stopWork();
                }
@@ -276,7 +277,7 @@ public class MainFrame extends JFrame implements TreeSelectionListener, ActionLi
                dat.setActionBytes(data);
                fis.read(data);
                fis.close();
-               editor.setText(dat.getASMSource(10));
+               editor.setText(dat.getASMSource(SWF.DEFAULT_VERSION));
             } catch (IOException ex) {
             }
 
@@ -288,7 +289,7 @@ public class MainFrame extends JFrame implements TreeSelectionListener, ActionLi
          if (ti.tag instanceof ASMSource) {
             ASMSource dat = (ASMSource) ti.tag;
             try {
-               dat.setActions(ASMParser.parse(new ByteArrayInputStream(editor.getText().getBytes()), 10), 10); //TODO:Ensure correct version here
+               dat.setActions(ASMParser.parse(new ByteArrayInputStream(editor.getText().getBytes()), SWF.DEFAULT_VERSION), SWF.DEFAULT_VERSION);
                valueChanged(null);
                JOptionPane.showMessageDialog(this, "Code successfully saved");
             } catch (IOException ex) {