diff --git a/java/src/processing/mode/java/JavaEditor.java b/java/src/processing/mode/java/JavaEditor.java
index 61fd15144..a38262864 100644
--- a/java/src/processing/mode/java/JavaEditor.java
+++ b/java/src/processing/mode/java/JavaEditor.java
@@ -1098,7 +1098,7 @@ public class JavaEditor extends Editor {
             if (!tweak) {
               runtime = jmode.handleLaunch(sketch, listener, present);
             } else {
-              runtime = jmode.handleTweak(sketch, listener);
+              runtime = jmode.handleTweak(sketch, listener, JavaEditor.this);
             }
           }
         }
diff --git a/java/src/processing/mode/java/JavaMode.java b/java/src/processing/mode/java/JavaMode.java
index c201dd7ca..9b5189fde 100644
--- a/java/src/processing/mode/java/JavaMode.java
+++ b/java/src/processing/mode/java/JavaMode.java
@@ -140,10 +140,8 @@ public class JavaMode extends Mode {
 
   /** Start a sketch in tweak mode */
   public Runner handleTweak(Sketch sketch,
-                            RunnerListener listener) throws SketchException {
-//                            final boolean present) throws SketchException {
-    final JavaEditor editor = (JavaEditor) listener;
-
+                            RunnerListener listener,
+                            JavaEditor editor) throws SketchException {
     // first try to build the unmodified code
     JavaBuild build = new JavaBuild(sketch);
 //    String appletClassName = build.build(false);