diff --git a/ubitx_20/ubitx_20.ino b/ubitx_20/ubitx_20.ino
index 216d34c..025fd9f 100644
--- a/ubitx_20/ubitx_20.ino
+++ b/ubitx_20/ubitx_20.ino
@@ -6,7 +6,7 @@
 //    So I put + in the sense that it was improved one by one based on Original Firmware.
 //    This firmware has been gradually changed based on the original firmware created by Farhan, Jack, Jerry and others.
 
-#define FIRMWARE_VERSION_INFO F("+v1.075")  
+#define FIRMWARE_VERSION_INFO F("+v1.080")  
 #define FIRMWARE_VERSION_NUM 0x03       //1st Complete Project : 1 (Version 1.061), 2st Project : 2
 
 /**
diff --git a/ubitx_20/ubitx_menu.ino b/ubitx_20/ubitx_menu.ino
index 79f4ad7..42bf7c0 100644
--- a/ubitx_20/ubitx_menu.ino
+++ b/ubitx_20/ubitx_menu.ino
@@ -271,8 +271,10 @@ void menuCHMemory(int btn, byte isMemoryToVfo){
       if (isMemoryToVfo == 1)
       {
         if (resultFreq > 3000 && resultFreq < 60000000)
-        setFrequency(resultFreq);
-        byteToMode(loadMode, 1);
+        {
+          byteToMode(loadMode, 1);
+          setFrequency(resultFreq);
+        }
       }
       else
       {
diff --git a/ubitx_20/ubitx_ui.ino b/ubitx_20/ubitx_ui.ino
index cf52eb0..aa3bae9 100644
--- a/ubitx_20/ubitx_ui.ino
+++ b/ubitx_20/ubitx_ui.ino
@@ -199,7 +199,7 @@ int getBtnStatus(void){
     readButtonValue = readButtonValue / 4;
     //return FKEY_VFOCHANGE;
     for (int i = 0; i < 16; i++)
-      if (KeyValues[i][0] <= readButtonValue && KeyValues[i][1] >= readButtonValue)
+      if (KeyValues[i][2] != 0 && KeyValues[i][0] <= readButtonValue && KeyValues[i][1] >= readButtonValue)
         return KeyValues[i][2];
         //return i;
   }