diff --git a/src/frontend/inpcom.c b/src/frontend/inpcom.c
index 1419b1cb6..6950033c8 100644
--- a/src/frontend/inpcom.c
+++ b/src/frontend/inpcom.c
@@ -7196,8 +7196,9 @@ static void inp_quote_params(struct card *c, struct card *end_c,
             continue;
 
         /* There are devices that should not get quotes around tokens
-           following after the terminals. See bug 384 */
-        if (curr_line[0] == 'f' || curr_line[0] == 'h')
+           following after the terminals. These may be model names or control
+           voltages. See bug 384  or Skywater issue 327 */
+        if (strchr("fhmouydqjz", *curr_line))
             num_terminals++;
 
         for (i = 0; i < num_params; i++) {