diff --git a/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java b/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java
index 3be40f376..5aca3283e 100644
--- a/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java
+++ b/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java
@@ -588,8 +588,10 @@ public class SWFInputStream extends InputStream {
       }
       if (goesPrev) {
       } else {
-         for (int i = 0; i < ip; i++) {
-            retdups.remove(0);
+         if (!retdups.isEmpty()) {
+            for (int i = 0; i < ip; i++) {
+               retdups.remove(0);
+            }
          }
       }
       List<Action> ret = new ArrayList<Action>();
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetVariable.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetVariable.java
index ee5674675..bbdda8fa1 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetVariable.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetVariable.java
@@ -38,7 +38,7 @@ public class ActionGetVariable extends Action {
    @Override
    public void translate(Stack<GraphTargetItem> stack, List<GraphTargetItem> output, java.util.HashMap<Integer, String> regNames, HashMap<String, GraphTargetItem> variables, HashMap<String, GraphTargetItem> functions) {
       GraphTargetItem name = stack.pop();
-      GraphTargetItem computedVal = variables.get(Highlighting.stripHilights(name.toStringNoQuotes()));
+      GraphTargetItem computedVal = variables.get(Highlighting.stripHilights(name.toStringNoQuotes(null)));
       GetVariableTreeItem gvt = new GetVariableTreeItem(this, name);
       gvt.setComputedValue(computedVal);
       stack.push(gvt);
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionSetVariable.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionSetVariable.java
index fa8bdbffb..85c85bb11 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionSetVariable.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionSetVariable.java
@@ -40,7 +40,7 @@ public class ActionSetVariable extends Action {
       GraphTargetItem value = stack.pop();
       GraphTargetItem name = stack.pop();
       SetVariableTreeItem svt = new SetVariableTreeItem(this, name, value);
-      variables.put(Highlighting.stripHilights(name.toStringNoQuotes(regNames, variables)), value);
+      variables.put(Highlighting.stripHilights(name.toStringNoQuotes(null)), value);
       output.add(svt);
    }
 }
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionCallFunction.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionCallFunction.java
index 476b26312..4115833e6 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionCallFunction.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionCallFunction.java
@@ -45,7 +45,7 @@ public class ActionCallFunction extends Action {
          args.add(stack.pop());
       }
       CallFunctionTreeItem cft = new CallFunctionTreeItem(this, functionName, args);
-      cft.calculatedFunction = functions.get(Highlighting.stripHilights(functionName.toStringNoQuotes(variables, functions)));
+      cft.calculatedFunction = functions.get(Highlighting.stripHilights(functionName.toStringNoQuotes(null)));
       stack.push(cft);
    }
 }
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineLocal.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineLocal.java
index bc3fbc2bb..8bb690a22 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineLocal.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineLocal.java
@@ -39,7 +39,7 @@ public class ActionDefineLocal extends Action {
    public void translate(Stack<GraphTargetItem> stack, List<GraphTargetItem> output, java.util.HashMap<Integer, String> regNames, HashMap<String, GraphTargetItem> variables, HashMap<String, GraphTargetItem> functions) {
       GraphTargetItem value = stack.pop();
       GraphTargetItem name = stack.pop();
-      variables.put(Highlighting.stripHilights(name.toStringNoQuotes(regNames, variables, functions)), value);
+      variables.put(Highlighting.stripHilights(name.toStringNoQuotes(null)), value);
       output.add(new DefineLocalTreeItem(this, name, value));
    }
 }