diff --git a/pd/src/g_graph.c b/pd/src/g_graph.c
index a995e5f571bfe78a382a16d8a8eabc1967802164..9006ee03897422fa236086a2b4acf7442abd5d70 100644
--- a/pd/src/g_graph.c
+++ b/pd/src/g_graph.c
@@ -143,18 +143,8 @@ void glist_delete(t_glist *x, t_gobj *y)
 		if (x->gl_editor && (ob = pd_checkobject(&y->g_pd))) {
 		    //rtext_new(x, ob);
 			rt = glist_findrtext(x, ob);
-			if (rt) {
-				if (pd_class(&y->g_pd) != canvas_class) {
-					//fprintf(stderr,"glist_delete calls rtext_free %lx %d %d %d\n",
-						//glist_findrtext(x, ob),
-						//(pd_class(&y->g_pd) != canvas_class ? 1 : 0),
-						//(!x->gl_isgraph ? 1 : 0),
-						//(!x->gl_owner ? 1 : 0));
-					  rtext_free(rt);
-				} else {
-					late_rtext_free = 1;
-				}
-			}
+			if (rt)
+				late_rtext_free = 1;
 		}
 		if (x->gl_list == y) {
 			if (y->g_next)
diff --git a/pd/src/g_rtext.c b/pd/src/g_rtext.c
index cf8ff2bd32d892bfbb245b66e8d064eaa68826de..f406175f00f8d55de2476cacad17021a46fc60f6 100644
--- a/pd/src/g_rtext.c
+++ b/pd/src/g_rtext.c
@@ -422,6 +422,18 @@ t_rtext *glist_findrtext(t_glist *gl, t_text *who)
     return (x);
 }
 
+/* same as above but without error reporting */
+t_rtext *glist_tryfindrtext(t_glist *gl, t_text *who)
+{
+    t_rtext *x=NULL;
+    if (!gl->gl_editor)
+        canvas_create_editor(gl);
+	if (gl->gl_editor->e_rtext)
+	    for (x = gl->gl_editor->e_rtext; x && x->x_text != who; x = x->x_next)
+    	    ;
+    return (x);
+}
+
 int rtext_width(t_rtext *x)
 {
     int w = 0, h = 0, indx;