diff --git a/rigs/dummy/flrig.c b/rigs/dummy/flrig.c
index 7c359d6be..ef2160bce 100644
--- a/rigs/dummy/flrig.c
+++ b/rigs/dummy/flrig.c
@@ -716,7 +716,7 @@ static rmode_t modeMapGetHamlib(const char *modeFLRig)
                   modeFLRigCheck, modeMap[i].mode_flrig);
 
         if (modeMap[i].mode_flrig
-                && strstr(modeMap[i].mode_flrig, modeFLRigCheck) == 0)
+                && strstr(modeMap[i].mode_flrig, modeFLRigCheck))
         {
             return (modeMap[i].mode_hamlib);
         }
diff --git a/simulators/Makefile.am b/simulators/Makefile.am
index ad9879b6b..f383f5ce7 100644
--- a/simulators/Makefile.am
+++ b/simulators/Makefile.am
@@ -8,7 +8,7 @@ DISTCLEANFILES =
 
 bin_PROGRAMS = 
 
-check_PROGRAMS = simelecraft simicgeneric simkenwood simyaesu simic9100 simic9700 simft991 simftdx1200 simftdx3000 simjupiter simpowersdr simid5100 simft736 simftdx5000 simtmd700 simrotorez simspid simft817 simts590 simft847 simic7300 simic7000 simic7100 simic7200 simatd578 simic905 simts450 simic7600 simic7610 simic705 simts950 simts990 simic7851 simftdx101 simxiegug90 simqrplabs simft818
+check_PROGRAMS = simelecraft simicgeneric simkenwood simyaesu simic9100 simic9700 simft991 simftdx1200 simftdx3000 simjupiter simpowersdr simid5100 simft736 simftdx5000 simtmd700 simrotorez simspid simft817 simts590 simft847 simic7300 simic7000 simic7100 simic7200 simatd578 simic905 simts450 simic7600 simic7610 simic705 simts950 simts990 simic7851 simftdx101 simxiegug90 simqrplabs simft818 simic275
 
 simelecraft_SOURCES = simelecraft.c 
 simkenwood_SOURCES = simkenwood.c 
diff --git a/simulators/simft817.c b/simulators/simft817.c
index 00adb9c3a..a77fd3ddf 100644
--- a/simulators/simft817.c
+++ b/simulators/simft817.c
@@ -18,6 +18,7 @@ struct ip_mreq
 
 #define BUFSIZE 256
 
+int vfo = 0; // 0=A, !0=B
 float freqA = 14074000;
 float freqB = 14074500;
 char tx_vfo = '0';
@@ -121,7 +122,11 @@ again:
 
         case 0x88: printf("PTT OFF\n"); break;
 
-        case 0x07: printf("MODE\n"); break;
+        case 0x07: 
+            printf("MODE %0xx\n", buf[0]); 
+            if (vfo == 0) modeA = buf[0];
+            else modeB = buf[0];
+            break;
 
         case 0x05: printf("CLAR ON\n"); break;
 
@@ -129,7 +134,10 @@ again:
 
         case 0xF5: printf("FREQ\n"); break;
 
-        case 0x81: printf("VFO TOGGLE\n"); break;
+        case 0x81: 
+        vfo = !vfo;
+        printf("VFO TOGGLE, %s active\n", vfo==0?"VFOA":"VFOB"); 
+        break;
 
         case 0x02: printf("SPLIT ON\n"); break;