diff --git a/src/frontend/inpcom.c b/src/frontend/inpcom.c
index ede6db76f..2405af102 100644
--- a/src/frontend/inpcom.c
+++ b/src/frontend/inpcom.c
@@ -2227,7 +2227,7 @@ inp_remove_ws(char *s)
             curr++;
         if (isspace(*curr)) {
             curr = skip_ws(curr);
-            if (*curr != '\0' && *curr != '=' && (!is_expression || (!is_arith_char(*curr) && *curr != ',')))
+            if (!(*curr == '\0' || *curr == '=' || (is_expression && (is_arith_char(*curr) || *curr == ','))))
                 big_buff[big_buff_index++] = ' ';
         }
     }