1 files changed, 6 insertions, 2 deletions
diff --git a/sources/scalac/transformer/matching/WordAutomInScala.java b/sources/scalac/transformer/matching/WordAutomInScala.java
index 04ebf52114..1654f69161 100644
--- a/sources/scalac/transformer/matching/WordAutomInScala.java
+++ b/sources/scalac/transformer/matching/WordAutomInScala.java
@@ -59,7 +59,7 @@ public class WordAutomInScala extends Autom2Scala {
      */
     public void translate() {
         initializeSyms();
-        Tree tb = code_body();
+        Tree tb = code_body_NEW();
         theDefDef = gen.DefDef(this.funSym, tb);
     }
 
@@ -95,8 +95,12 @@ public class WordAutomInScala extends Autom2Scala {
     public WordAutomInScala(DetWordAutom dfa,
                             Type elementType,
                             Symbol owner,
-                            CodeFactory cf) {
+                            CodeFactory cf,
+			    boolean optim) {
         super(dfa, elementType, owner, cf);
+
+        this.optimize &= optim;
+
     }
 
 }