diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
index 1e7644654..09cdda92e 100644
--- a/core/src/processing/core/PApplet.java
+++ b/core/src/processing/core/PApplet.java
@@ -7671,6 +7671,13 @@ public class PApplet extends Applet
     recorder.beginDraw();
   }
 
+  public PShape beginRecord() {
+    if (!g.isRecordingShape()) {
+      return g.beginRecord();
+    }
+    return null;
+  }
+  
 
   public void endRecord() {
     if (recorder != null) {
@@ -7678,9 +7685,9 @@ public class PApplet extends Applet
       recorder.dispose();
       recorder = null;
     }
-//    if (g.isRecording()) {
-//    g.endRecord();
-//    }
+    if (g.isRecordingShape()) {
+      g.endRecord();
+    }
   }
 
 
@@ -10268,6 +10275,11 @@ public class PApplet extends Applet
   }
 
 
+  public boolean isRecordingShape() {
+    return g.isRecordingShape();
+  }
+
+
   public void mergeShapes(boolean val) {
     if (recorder != null) recorder.mergeShapes(val);
     g.mergeShapes(val);
diff --git a/core/src/processing/core/PGraphics.java b/core/src/processing/core/PGraphics.java
index abff0fa6e..74608a061 100644
--- a/core/src/processing/core/PGraphics.java
+++ b/core/src/processing/core/PGraphics.java
@@ -5938,21 +5938,22 @@ public class PGraphics extends PImage implements PConstants {
     showMissingWarning("textureBlend");
   }
 
-//  public PShape beginRecord() { // ignore
-//    showMissingWarning("beginRecord");
-//    return null;
-//  }
+
+  public PShape beginRecord() { // ignore
+    showMissingWarning("beginRecord");
+    return null;
+  }
+  
+
+  public void endRecord() {  // ignore
+    showMissingWarning("endRecord");
+  }
 
 
-//  public void endRecord() {  // ignore
-//    showMissingWarning("endRecord");
-//  }
-
-
-//  public boolean isRecording() {
-//    showMissingWarning("isRecording");
-//    return false;
-//  }
+  public boolean isRecordingShape() {
+    //showMissingWarning("isRecording");
+    return false;
+  }
 
 
   public void mergeShapes(boolean val) {