diff --git a/src/cache.c b/src/cache.c
index 4ae32fed1..9f8dca38a 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -154,6 +154,7 @@ int rig_set_cache_freq(RIG *rig, vfo_t vfo, freq_t freq)
             break;
 
         case RIG_VFO_A:
+        case RIG_VFO_VFO:
         case RIG_VFO_MAIN:
         case RIG_VFO_MAIN_A:
             rig->state.cache.freqMainA = freq;
@@ -300,6 +301,7 @@ int rig_get_cache(RIG *rig, vfo_t vfo, freq_t *freq, int *cache_ms_freq,
     switch (vfo)
     {
         case RIG_VFO_CURR:
+        case RIG_VFO_VFO:
             *freq = rig->state.cache.freqCurr;
             *mode = rig->state.cache.modeCurr;
             *width = rig->state.cache.widthCurr;
diff --git a/src/misc.c b/src/misc.c
index 35991addb..e46b6741a 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -1868,7 +1868,7 @@ vfo_t HAMLIB_API vfo_fixup(RIG *rig, vfo_t vfo, split_t split)
               __func__, funcname, linenum,
               rig_strvfo(vfo), rig_strvfo(rig->state.current_vfo), split);
 
-    if (vfo == RIG_VFO_CURR)
+    if (vfo == RIG_VFO_CURR || vfo == RIG_VFO_VFO)
     {
         rig_debug(RIG_DEBUG_TRACE, "%s: Leaving currVFO alone\n", __func__);
         return vfo;  // don't modify vfo for RIG_VFO_CURR