diff --git a/src/rig.c b/src/rig.c
index e90ca43a2..db38adbc8 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -2495,6 +2495,8 @@ int HAMLIB_API rig_set_vfo(RIG *rig, vfo_t vfo)
         RETURNFUNC(-RIG_EIO);
     }
 
+    vfo = vfo_fixup(rig, vfo);
+
     if (vfo == RIG_VFO_CURR) { RETURNFUNC(RIG_OK); }
 
     // make sure we are asking for a VFO that the rig actually has