diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 5e8af1350..5878979c7 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -2111,8 +2111,7 @@ int icom_set_vfo(RIG *rig, vfo_t vfo)
             return -RIG_ERJCTED;
         }
 
-        rig->state.current_vfo = vfo;
-        return RIG_OK;
+        icvfo = RIG_VFO_MAIN_A ? S_VFOA : S_VFOB;
 
         break;
 
@@ -2133,8 +2132,7 @@ int icom_set_vfo(RIG *rig, vfo_t vfo)
             return -RIG_ERJCTED;
         }
 
-        rig->state.current_vfo = vfo;
-        return RIG_OK;
+        icvfo = RIG_VFO_SUB_A ? S_VFOA : S_VFOB;
 
         break;
 
diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h
index 5efb6283c..f016345a8 100644
--- a/rigs/icom/icom.h
+++ b/rigs/icom/icom.h
@@ -31,7 +31,7 @@
 #include <sys/time.h>
 #endif
 
-#define BACKEND_VER "20200715"
+#define BACKEND_VER "20200719"
 
 /*
  * defines used by comp_cal_str in rig.c