diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/AVM2Code.java b/trunk/src/com/jpexs/asdec/abc/avm2/AVM2Code.java
index ae28178fb..d8a5c8ad1 100644
--- a/trunk/src/com/jpexs/asdec/abc/avm2/AVM2Code.java
+++ b/trunk/src/com/jpexs/asdec/abc/avm2/AVM2Code.java
@@ -1635,11 +1635,48 @@ public class AVM2Code {
                ins.definition.translate(isStatic, classIndex, localRegs, stack, scopeStack, constants, ins, method_info, output, body, abc, localRegNames, fullyQualifiedNames);
                ip = end + 1;
                break;
+            } else if (ins.definition instanceof NewFunctionIns) {
+               String functionName = "";
+               if ((ip >= start + 2) && (ip <= end - 4)) {
+                  AVM2Instruction prev2 = code.get(ip - 2);
+                  if (prev2.definition instanceof NewObjectIns) {
+                     if (prev2.operands[0] == 0) {
+                        if (code.get(ip - 1).definition instanceof PushWithIns) {
+                           boolean hasDup = false;
+                           int plus = 0;
+                           if (code.get(ip + 1).definition instanceof DupIns) {
+                              hasDup = true;
+                              plus = 1;
+                           }
+                           AVM2Instruction psco = code.get(ip + 1 + plus);
+                           if (psco.definition instanceof GetScopeObjectIns) {
+                              if (psco.operands[0] == scopeStack.size() - 1) {
+                                 if (code.get(ip + plus + 2).definition instanceof SwapIns) {
+                                    if (code.get(ip + plus + 4).definition instanceof PopScopeIns) {
+                                       if (code.get(ip + plus + 3).definition instanceof SetPropertyIns) {
+                                          functionName = abc.constants.constant_multiname[code.get(ip + plus + 3).operands[0]].getName(constants, fullyQualifiedNames);
+                                          scopeStack.pop();//with
+                                          output.remove(output.size()-1); //with
+                                          ip = ip + plus + 4; //+1 below
+                                       }
+                                    }
+                                 }
+                              }
+                           }
+                        }
+                     }
+                  }
+               }
+               //What to do when hasDup is false?
+               ins.definition.translate(isStatic, classIndex, localRegs, stack, scopeStack, constants, ins, method_info, output, body, abc, localRegNames, fullyQualifiedNames);
+               NewFunctionTreeItem nft=(NewFunctionTreeItem)stack.peek();
+               nft.functionName=functionName;
+               ip++;
             } else {
                ins.definition.translate(isStatic, classIndex, localRegs, stack, scopeStack, constants, ins, method_info, output, body, abc, localRegNames, fullyQualifiedNames);
-
-               addr += ins.getBytes().length;
+               
                ip++;
+               addr = pos2adr(ip);
             }
 
          }
diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewFunctionIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewFunctionIns.java
index d8574a665..598a95d80 100644
--- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewFunctionIns.java
+++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewFunctionIns.java
@@ -41,12 +41,13 @@ public class NewFunctionIns extends InstructionDefinition {
       int methodIndex = ins.operands[0];
       MethodBody mybody = abc.findBody(methodIndex);
       String bodyStr = "";
-      String paramStr = "";
+      String paramStr = "";      
       if (mybody != null) {
          bodyStr = Highlighting.hilighMethodEnd() + mybody.toString(false, isStatic, classIndex, abc, constants, method_info, new Stack<TreeItem>()/*scopeStack*/, false, true, fullyQualifiedNames, null) + Highlighting.hilighMethodBegin(body.method_info);
          paramStr = method_info[methodIndex].getParamStr(constants, mybody, abc, fullyQualifiedNames);
       }
-      stack.push(new NewFunctionTreeItem(ins, paramStr, method_info[methodIndex].getReturnTypeStr(constants, fullyQualifiedNames), bodyStr));
+
+      stack.push(new NewFunctionTreeItem(ins,"", paramStr, method_info[methodIndex].getReturnTypeStr(constants, fullyQualifiedNames), bodyStr));
    }
 
    @Override
diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewFunctionTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewFunctionTreeItem.java
index 5aa6e5b52..317680228 100644
--- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewFunctionTreeItem.java
+++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewFunctionTreeItem.java
@@ -26,16 +26,18 @@ public class NewFunctionTreeItem extends TreeItem {
    public String paramStr;
    public String returnStr;
    public String functionBody;
+   public String functionName;
 
-   public NewFunctionTreeItem(AVM2Instruction instruction, String paramStr, String returnStr, String functionBody) {
+   public NewFunctionTreeItem(AVM2Instruction instruction, String functionName, String paramStr, String returnStr, String functionBody) {
       super(instruction, PRECEDENCE_PRIMARY);
       this.paramStr = paramStr;
       this.returnStr = returnStr;
       this.functionBody = functionBody;
+      this.functionName = functionName;
    }
 
    @Override
    public String toString(ConstantPool constants, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames) {
-      return hilight("new function(" + paramStr + "):" + returnStr + "\r\n{\r\n") + functionBody + "\r\n" + hilight("}");
+      return hilight("new function"+(!functionName.equals("")?" "+functionName:"")+"(" + paramStr + "):" + returnStr + "\r\n{\r\n") + functionBody + "\r\n" + hilight("}");
    }
 }