diff --git a/src/ir_decoder/include/irda_decode.h b/src/ir_decoder/include/irda_decode.h
index af92423..2697702 100644
--- a/src/ir_decoder/include/irda_decode.h
+++ b/src/ir_decoder/include/irda_decode.h
@@ -28,6 +28,13 @@ Revision log:
 #define AC_PARAMETER_TYPE_1          0
 #define AC_PARAMETER_TYPE_2          1
 
+const UINT16 tag_index[TAG_COUNT_FOR_PROTOCOL] =
+{
+    1, 2, 3, 4, 5, 6, 7,
+    21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
+    41, 42, 43, 44, 45, 46, 47, 48
+};
+
 typedef enum
 {
     AC_POWER_ON = 0,
diff --git a/src/ir_decoder/irda_decode.c b/src/ir_decoder/irda_decode.c
index cc4def5..3af8e8b 100644
--- a/src/ir_decoder/irda_decode.c
+++ b/src/ir_decoder/irda_decode.c
@@ -42,14 +42,6 @@ UINT16 user_data[USER_DATA_SIZE] = {0};
 UINT8 tv_bin[EXPECTED_MEM_SIZE] = {0};
 remote_ac_status_t ac_status;
 
-const UINT16 tag_index[TAG_COUNT_FOR_PROTOCOL] =
-{
-    1, 2, 3, 4, 5, 6, 7, 21, 22,
-    23, 24, 25, 26, 27, 28, 29, 30,
-    31, 32, 33, 34, 41, 42, 43, 44, 45,
-    46, 47, 48
-};
-
 // 2016-10-09 updated by strawmanbobi, change global data context to array pointer
 protocol *context = (protocol *) byteArray;
 
diff --git a/src/ir_encoder/irda_ac_encode.py b/src/ir_encoder/irda_ac_encode.py
index f9f7843..3f0ef15 100644
--- a/src/ir_encoder/irda_ac_encode.py
+++ b/src/ir_encoder/irda_ac_encode.py
@@ -10,9 +10,10 @@ import xml.dom.minidom
 import struct
 
 
-alltags = [300, 301, 302, 303, 305, 306, 307, 1001, 1002, 1003,
-           1004, 1005, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1015,
-           1016, 1501, 1502, 1503, 1504, 1505, 1506, 1508, 1509]
+alltags = [1, 2, 3, 4, 5, 6, 7,
+           21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
+           41, 42, 43, 44, 45, 46, 47, 48]
+
 tags_max_size = [0 for x in range(0, len(alltags))]
 
 # Definition of ac tag class