diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index fa203985a..a50a25a41 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -1024,14 +1024,20 @@ int icom_set_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->sub_freq = freq; break;
 
     case RIG_VFO_SUB: priv->main_freq = freq; break;
 
+    case RIG_VFO_CURR: break; 
+
     default:
         rig_debug(RIG_DEBUG_ERR, "%s: unknown VFO?  VFO=%s\n", __func__,
                   rig_strvfo(vfo));