diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 0afebe105..47ce54096 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -2240,12 +2240,12 @@ int icom_set_vfo(RIG *rig, vfo_t vfo)
     else if ((vfo == RIG_VFO_A || vfo == RIG_VFO_MAIN) && VFO_HAS_DUAL)
     {
         // If we're being asked for A/Main but we are a MainA/MainB rig change it
-        vfo = RIG_VFO_MAIN_A;
+        vfo = RIG_VFO_MAIN;
     }
     else if ((vfo == RIG_VFO_B || vfo == RIG_VFO_SUB) && VFO_HAS_DUAL)
     {
         // If we're being asked for B/Sub but we are a MainA/MainB rig change it
-        vfo = RIG_VFO_MAIN_B;
+        vfo = RIG_VFO_SUB;
 
         // If we're in satmode for rigs like IC9700 we want the 2nd VFO
         if (rig->state.cache.satmode)
diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h
index c43fc4844..286e6536b 100644
--- a/rigs/icom/icom.h
+++ b/rigs/icom/icom.h
@@ -30,7 +30,7 @@
 #include <sys/time.h>
 #endif
 
-#define BACKEND_VER "20210326"
+#define BACKEND_VER "20210330"
 
 /*
  * defines used by comp_cal_str in rig.c