diff --git a/src/rig.c b/src/rig.c
index 6715e6de5..18c8b2ddf 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -1354,7 +1354,9 @@ int HAMLIB_API rig_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
 
         curr_vfo = rig->state.current_vfo;
         retcode = caps->set_vfo(rig, vfo);
-        vfo = rig->state.current_vfo; // can't call get_vfo since Icoms don't have it
+        // why is the line below here?  
+        // it's causing set_freq on the wrong vfo
+        //vfo = rig->state.current_vfo; // can't call get_vfo since Icoms don't have it
 
         if (retcode != RIG_OK)
         {
@@ -1995,6 +1997,7 @@ int HAMLIB_API rig_set_vfo(RIG *rig, vfo_t vfo)
     {
         rig->state.current_vfo = vfo;
         rig->state.cache.vfo = vfo;
+        rig_debug(RIG_DEBUG_TRACE, "%s: rig->state.current_vfo=%s\n", __func__, rig_strvfo(vfo));
     }
     else
     {