diff --git a/rigs/dummy/netrigctl.c b/rigs/dummy/netrigctl.c
index e94a907a7..7dd92e248 100644
--- a/rigs/dummy/netrigctl.c
+++ b/rigs/dummy/netrigctl.c
@@ -2289,10 +2289,15 @@ static int netrigctl_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op)
     int ret, len;
     char cmd[CMD_MAX];
     char buf[BUF_MAX];
+    char vfostr[16] = "";
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
 
-    len = sprintf(cmd, "J %s\n", rig_strvfop(op));
+    ret = netrigctl_vfostr(rig, vfostr, sizeof(vfostr), vfo);
+
+    if (ret != RIG_OK) { return ret; }
+
+    len = sprintf(cmd, "G%s %s\n", vfostr, rig_strvfop(op));
 
     ret = netrigctl_transaction(rig, cmd, len, buf);
 
@@ -2579,7 +2584,7 @@ struct rig_caps netrigctl_caps =
     RIG_MODEL(RIG_MODEL_NETRIGCTL),
     .model_name =     "NET rigctl",
     .mfg_name =       "Hamlib",
-    .version =        "20211118.0",
+    .version =        "20211120.0",
     .copyright =      "LGPL",
     .status =         RIG_STATUS_STABLE,
     .rig_type =       RIG_TYPE_OTHER,
diff --git a/src/misc.c b/src/misc.c
index 13305050b..4af4991c4 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -586,7 +586,7 @@ static const struct
     { RIG_VFO_SUB_C, "SubC" },
     { RIG_VFO_NONE, "None" },
     { RIG_VFO_OTHER, "otherVFO" },
-    { 0xffffff, "" },
+    { 0xffffffff, "" },
 };
 
 
@@ -607,10 +607,12 @@ vfo_t HAMLIB_API rig_parse_vfo(const char *s)
     {
         if (!strcmp(s, vfo_str[i].str))
         {
+            rig_debug(RIG_DEBUG_CACHE, "%s: str='%s' vfo='%s'\n", __func__, vfo_str[i].str, rig_strvfo(vfo_str[i].vfo));
             return vfo_str[i].vfo;
         }
     }
 
+    rig_debug(RIG_DEBUG_ERR, "%s: '%s' not found so vfo='%s'\n", __func__, s, rig_strvfo(RIG_VFO_NONE));
     return RIG_VFO_NONE;
 }
 
diff --git a/tests/rigctl_parse.c b/tests/rigctl_parse.c
index bf8798d49..24f53fd02 100644
--- a/tests/rigctl_parse.c
+++ b/tests/rigctl_parse.c
@@ -3633,6 +3633,7 @@ declare_proto_rig(vfo_op)
 
     if (RIG_OP_NONE == op)
     {
+        rig_debug(RIG_DEBUG_ERR, "%s: rig_parse_vfo failed with '%s'\n", __func__, arg1);
         RETURNFUNC(-RIG_EINVAL);
     }