diff --git a/rigs/jrc/jst145.c b/rigs/jrc/jst145.c
index c8b497c9e..61510e27e 100644
--- a/rigs/jrc/jst145.c
+++ b/rigs/jrc/jst145.c
@@ -78,7 +78,7 @@ const struct rig_caps jst145_caps =
     RIG_MODEL(RIG_MODEL_JST145),
     .model_name = "JST-145",
     .mfg_name =  "JRC",
-    .version =  BACKEND_VER ".3",
+    .version =  BACKEND_VER ".4",
     .copyright =  "LGPL",
     .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_TRANSCEIVER,
@@ -179,7 +179,7 @@ const struct rig_caps jst245_caps =
     RIG_MODEL(RIG_MODEL_JST245),
     .model_name = "JST-245",
     .mfg_name =  "JRC",
-    .version =  BACKEND_VER ".3",
+    .version =  BACKEND_VER ".4",
     .copyright =  "LGPL",
     .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_TRANSCEIVER,
@@ -374,6 +374,8 @@ static int jst145_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
     struct jst145_priv_data *priv = rig->state.priv;
     vfo_t save_vfo = rig->state.current_vfo;
 
+    if (vfo == RIG_VFO_CURR) vfo = save_vfo;
+
     SNPRINTF(freqbuf, sizeof(freqbuf), "F%08u%c\r", (unsigned)(freq),
              vfo == RIG_VFO_A ? 'A' : 'B');