diff --git a/core/src/processing/core/PShape.java b/core/src/processing/core/PShape.java
index bcc5fa200..dc0bb1107 100644
--- a/core/src/processing/core/PShape.java
+++ b/core/src/processing/core/PShape.java
@@ -84,12 +84,16 @@ public class PShape implements PConstants {
 //  /** Generic, only draws its child objects. */
 //  static public final int GROUP = 0;
   // GROUP now inherited from PConstants, and is still zero
+
+  // These constants were updated in 3.0b6 so that they could be distinguished
+  // from others in PConstants and improve how some typos were handled.
+  // https://github.com/processing/processing/issues/3776
   /** A line, ellipse, arc, image, etc. */
-  static public final int PRIMITIVE = 1;
+  static public final int PRIMITIVE = 101;
   /** A series of vertex, curveVertex, and bezierVertex calls. */
-  static public final int PATH = 2;
+  static public final int PATH = 102;
   /** Collections of vertices created with beginShape(). */
-  static public final int GEOMETRY = 3;
+  static public final int GEOMETRY = 103;
   /** The shape type, one of GROUP, PRIMITIVE, PATH, or GEOMETRY. */
   protected int family;
 
diff --git a/core/todo.txt b/core/todo.txt
index 4f9b19da7..7680e7f05 100644
--- a/core/todo.txt
+++ b/core/todo.txt
@@ -14,6 +14,10 @@ X add surface.setAlwaysOnTop(boolean)
 X   https://github.com/processing/processing/issues/3718
 X Implement standard cursor types in OpenGL
 X   https://github.com/processing/processing/issues/3554
+X Change value of constants PRIMITIVE, PATH, and GEOMETRY constants in PShape
+X   This avoids a collision with entries in PConstants which causes 
+X   confusing errors or no errors to be thrown at all
+X   https://github.com/processing/processing/issues/3776
 
 andres
 X P2D: error calling surface.setTitle()
diff --git a/todo.txt b/todo.txt
index 474712bcb..7b8c12bfe 100644
--- a/todo.txt
+++ b/todo.txt
@@ -61,6 +61,7 @@ X   https://github.com/processing/processing/pull/3684
 X Ready to add contributed example packages?
 X   https://github.com/processing/processing/issues/2953
 
+
 known issues
 _ launch4j doesn't work from folders with non-native charsets
 _   anything in CP1252 on an English Windows system is fine