diff --git a/src/hack.c b/src/hack.c
index 0687c0ef6..3246bb6af 100644
--- a/src/hack.c
+++ b/src/hack.c
@@ -2476,7 +2476,7 @@ dopickup()
     struct trap *traphere = t_at(u.ux, u.uy);
 
     /* awful kludge to work around parse()'s pre-decrement */
-    count = (multi || (save_cm && *save_cm == ',')) ? multi + 1 : 0;
+    count = (multi || (save_cm && *save_cm == cmd_from_func(dopickup))) ? multi + 1 : 0;
     multi = 0; /* always reset */
     /* uswallow case added by GAN 01/29/87 */
     if (u.uswallow) {