diff --git a/tools/shell/src/shellAuto.c b/tools/shell/src/shellAuto.c
index 103fa9e1cf..55955b2d36 100644
--- a/tools/shell/src/shellAuto.c
+++ b/tools/shell/src/shellAuto.c
@@ -1402,7 +1402,7 @@ char * lastWord(char * p) {
   char * p2 = strrchr(p, ',');
 
   if (p1 && p2) {
-    return MAX(p1, p2) + 1;
+    return p1 > p2 ? p1 : p2 + 1;
   } else if (p1) {
     return p1 + 1;
   } else if(p2) {