diff --git a/collects/tests/mred/draw.ss b/collects/tests/mred/draw.ss
index 8be648b3..4be5744d 100644
--- a/collects/tests/mred/draw.ss
+++ b/collects/tests/mred/draw.ss
@@ -197,6 +197,8 @@
 			     (make-object wx:point% 5 95))
 			    (+ x 12) (+ y 15))
 
+		      (send dc draw-point (+ x 35) (+ y 115))
+		      
 		      (send dc draw-line
 			    (+ x 5) (+ y 125) (+ x 10) (+ y 125))
 		      (send dc draw-line
diff --git a/collects/tests/mred/item.ss b/collects/tests/mred/item.ss
index 35c73fc9..2e0aae52 100644
--- a/collects/tests/mred/item.ss
+++ b/collects/tests/mred/item.ss
@@ -891,7 +891,11 @@
 				      (send e set-command-int p)
 				      (send e set-extra-long 1)
 				      (send e set-event-object c)
-				      (send e set-command-string (list-ref actual-content p))
+				      (send e set-command-string 
+					    (if (< -1 p (length actual-content))
+						(list-ref actual-content p)
+						"???"))
+				      (when list? (send c set-first-item p))
 				      (send c command e)))
 				  " by Simulate" #t))
   (define tb (make-object mred:button% p