diff --git a/Multiprotocol/MT99xx_nrf24l01.ino b/Multiprotocol/MT99xx_nrf24l01.ino
index 667c18b..9ed25b0 100644
--- a/Multiprotocol/MT99xx_nrf24l01.ino
+++ b/Multiprotocol/MT99xx_nrf24l01.ino
@@ -90,13 +90,6 @@ static void __attribute__((unused)) MT99XX_send_packet()
 		packet[0] = 0x20;
 		switch(sub_protocol)
 		{
-			case A180:
-				packet_period = MT99XX_PACKET_PERIOD_A180;
-			default:	// MT99 & H7 & A180
-				packet[1] = 0x14;
-				packet[2] = 0x03;
-				packet[3] = 0x25;
-				break;
 			case YZ:
 				packet_period = MT99XX_PACKET_PERIOD_YZ;
 				packet[1] = 0x15;
@@ -114,6 +107,13 @@ static void __attribute__((unused)) MT99XX_send_packet()
 				packet[2] = 0x12;
 				packet[3] = 0x17;
 				break;
+			case A180:
+				packet_period = MT99XX_PACKET_PERIOD_A180;
+			default:	// MT99 & H7 & A180
+				packet[1] = 0x14;
+				packet[2] = 0x03;
+				packet[3] = 0x25;
+				break;
 		}
 		packet[4] = rx_tx_addr[0];
 		packet[5] = rx_tx_addr[1];
@@ -249,24 +249,25 @@ static void __attribute__((unused)) MT99XX_initialize_txid()
 {
 	rx_tx_addr[1] = rx_tx_addr[3]; // RX_Num
 
-    if(sub_protocol == YZ)
+	switch(protocol)
 	{
-		rx_tx_addr[0] = 0x53; // test (SB id)
-		rx_tx_addr[1] = 0x00;
-		rx_tx_addr[2] = 0x00;
-	}
-	else
-		if(sub_protocol == FY805)
-		{
+		case YZ:
+			rx_tx_addr[0] = 0x53; // test (SB id)
+			rx_tx_addr[1] = 0x00;
+			rx_tx_addr[2] = 0x00;
+			break;
+		case FY805:
 			rx_tx_addr[0] = 0x81; // test (SB id)
 			rx_tx_addr[1] = 0x0F;
 			rx_tx_addr[2] = 0x00;
-		}
-		else
-			if(sub_protocol == LS)
-				rx_tx_addr[0] = 0xCC;
-			else //MT99 & H7 & A180
-				rx_tx_addr[2] = 0x00;
+			break;
+		case LS:
+			rx_tx_addr[0] = 0xCC;
+			break;
+		default: //MT99 & H7 & A180
+			rx_tx_addr[2] = 0x00;
+	}
+	
 	rx_tx_addr[3] = 0xCC;
 	rx_tx_addr[4] = 0xCC;
 
diff --git a/Multiprotocol/Multi_Names.ino b/Multiprotocol/Multi_Names.ino
index 5ebbf12..8c33e8a 100644
--- a/Multiprotocol/Multi_Names.ino
+++ b/Multiprotocol/Multi_Names.ino
@@ -114,7 +114,7 @@ const char STR_SUBTYPE_SLT[] =        "\x06""V1_6ch""V2_8ch""Q100\0 ""Q200\0 ""M
 const char STR_SUBTYPE_CX10[] =       "\x07""Green\0 ""Blue\0  ""DM007\0 ""-\0     ""JC3015a""JC3015b""MK33041";
 const char STR_SUBTYPE_CG023[] =      "\x05""Std\0 ""YD829";
 const char STR_SUBTYPE_BAYANG[] =     "\x07""Std\0   ""H8S3D\0 ""X16 AH\0""IRDrone""DHD D4\0""QX100\0 ";
-const char STR_SUBTYPE_MT99[] =       "\x06""MT99\0 ""H7\0   ""YZ\0   ""LS\0   ""FY805""A180\0";
+const char STR_SUBTYPE_MT99[] =       "\x05""MT99\0""H7\0  ""YZ\0  ""LS\0  ""FY805""A180\0";
 const char STR_SUBTYPE_MJXQ[] =       "\x07""WLH08\0 ""X600\0  ""X800\0  ""H26D\0  ""E010\0  ""H26WH\0 ""Phoenix";
 const char STR_SUBTYPE_FY326[] =      "\x05""Std\0 ""FY319";
 const char STR_SUBTYPE_HONTAI[] =     "\x07""Std\0   ""JJRC X1""X5C1\0  ""FQ_951";
diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h
index a8794f1..9a8b00e 100644
--- a/Multiprotocol/Multiprotocol.h
+++ b/Multiprotocol/Multiprotocol.h
@@ -19,7 +19,7 @@
 #define VERSION_MAJOR		1
 #define VERSION_MINOR		3
 #define VERSION_REVISION	2
-#define VERSION_PATCH_LEVEL	17
+#define VERSION_PATCH_LEVEL	18
 
 //******************
 // Protocols