diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index a50a25a41..bdb8f024b 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -1032,9 +1032,9 @@ int icom_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
     case RIG_VFO_SUB_B:
     case RIG_VFO_B: priv->vfob_freq = freq; break;
 
-    case RIG_VFO_MAIN: priv->sub_freq = freq; break;
+    case RIG_VFO_MAIN: priv->main_freq = freq; break;
 
-    case RIG_VFO_SUB: priv->main_freq = freq; break;
+    case RIG_VFO_SUB: priv->sub_freq = freq; break;
 
     case RIG_VFO_CURR: break; 
 
@@ -1229,14 +1229,20 @@ int icom_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
 
     switch (vfo)
     {
+    case RIG_VFO_MAIN_A:
+    case RIG_VFO_SUB_A:
     case RIG_VFO_A: priv->vfoa_freq = *freq; break;
 
+    case RIG_VFO_MAIN_B:
+    case RIG_VFO_SUB_B:
     case RIG_VFO_B: priv->vfob_freq = *freq; break;
 
     case RIG_VFO_MAIN: priv->main_freq = *freq; break;
 
     case RIG_VFO_SUB: priv->sub_freq = *freq; break;
 
+    case RIG_VFO_CURR: break; 
+
     default:
         rig_debug(RIG_DEBUG_ERR, "%s: unknown VFO?  VFO=%s\n", __func__,
                   rig_strvfo(vfo));
diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h
index 9e4b8c729..e6bd2248d 100644
--- a/rigs/icom/icom.h
+++ b/rigs/icom/icom.h
@@ -31,7 +31,7 @@
 #include <sys/time.h>
 #endif
 
-#define BACKEND_VER "20200612"
+#define BACKEND_VER "20200613"
 
 /*
  * defines used by comp_cal_str in rig.c