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