diff --git a/src/csharp/Intel/Generator/Decoder/DecoderTable_Legacy.cs b/src/csharp/Intel/Generator/Decoder/DecoderTable_Legacy.cs
index 2bb6759f6..dc03a4370 100644
--- a/src/csharp/Intel/Generator/Decoder/DecoderTable_Legacy.cs
+++ b/src/csharp/Intel/Generator/Decoder/DecoderTable_Legacy.cs
@@ -1872,7 +1872,7 @@ public static (string name, object?[] handlers)[] CreateHandlers(GenTypes genTyp
 				}),
 				("grp0F0D", new object[] { legacyEnum[nameof(OpCodeHandlerKind.RM)],
 					"reservedNop_0F0D",
-					new object[] { legacyEnum[nameof(OpCodeHandlerKind.RM)], "reservedNop_0F0D", new object[] { legacyEnum[nameof(OpCodeHandlerKind.Group)], "handlers_Grp_0F0D_mem" } }
+					new object[] { legacyEnum[nameof(OpCodeHandlerKind.Group)], "handlers_Grp_0F0D_mem" }
 				}),
 
 				("handlers_Grp_0F18_mem",
@@ -1890,7 +1890,7 @@ public static (string name, object?[] handlers)[] CreateHandlers(GenTypes genTyp
 					"reservedNop_0F18",
 					new object[] { legacyEnum[nameof(OpCodeHandlerKind.RM)],
 						"reservedNop_0F18",
-						new object[] { legacyEnum[nameof(OpCodeHandlerKind.RM)], "reservedNop_0F18", new object[] { legacyEnum[nameof(OpCodeHandlerKind.Group)], "handlers_Grp_0F18_mem" } }
+						new object[] { legacyEnum[nameof(OpCodeHandlerKind.Group)], "handlers_Grp_0F18_mem" }
 					}
 				}),
 
@@ -1914,7 +1914,7 @@ public static (string name, object?[] handlers)[] CreateHandlers(GenTypes genTyp
 					"reservedNop_0F1C",
 					new object[] { legacyEnum[nameof(OpCodeHandlerKind.RM)],
 						"reservedNop_0F1C",
-						new object[] { legacyEnum[nameof(OpCodeHandlerKind.RM)], "reservedNop_0F1C", new object[] { legacyEnum[nameof(OpCodeHandlerKind.Group)], "handlers_Grp_0F1C_mem" } }
+						new object[] { legacyEnum[nameof(OpCodeHandlerKind.Group)], "handlers_Grp_0F1C_mem" }
 					}
 				}),
 
diff --git a/src/csharp/Intel/Iced/Intel/DecoderInternal/OpCodeHandlersTables_Legacy.g.cs b/src/csharp/Intel/Iced/Intel/DecoderInternal/OpCodeHandlersTables_Legacy.g.cs
index 51bd44281..ee2d065c8 100644
--- a/src/csharp/Intel/Iced/Intel/DecoderInternal/OpCodeHandlersTables_Legacy.g.cs
+++ b/src/csharp/Intel/Iced/Intel/DecoderInternal/OpCodeHandlersTables_Legacy.g.cs
@@ -2563,12 +2563,9 @@ static byte[] GetSerializedTables() =>
 				0x09,// RM
 					0x07,// HandlerReference
 						0x31,// 0x31 = reservedNop_0F0D
-					0x09,// RM
-						0x07,// HandlerReference
-							0x31,// 0x31 = reservedNop_0F0D
-						0x0E,// Group
-							0x08,// ArrayReference
-								0x3A,// 0x3A = handlers_Grp_0F0D_mem
+					0x0E,// Group
+						0x08,// ArrayReference
+							0x3A,// 0x3A = handlers_Grp_0F0D_mem
 
 				// handlers_Grp_0F18_mem
 				0x01,// ArrayReference
@@ -2603,12 +2600,9 @@ static byte[] GetSerializedTables() =>
 					0x09,// RM
 						0x07,// HandlerReference
 							0x32,// 0x32 = reservedNop_0F18
-						0x09,// RM
-							0x07,// HandlerReference
-								0x32,// 0x32 = reservedNop_0F18
-							0x0E,// Group
-								0x08,// ArrayReference
-									0x3C,// 0x3C = handlers_Grp_0F18_mem
+						0x0E,// Group
+							0x08,// ArrayReference
+								0x3C,// 0x3C = handlers_Grp_0F18_mem
 
 				// handlers_Grp_0F1C_mem
 				0x01,// ArrayReference
@@ -2635,12 +2629,9 @@ static byte[] GetSerializedTables() =>
 					0x09,// RM
 						0x07,// HandlerReference
 							0x36,// 0x36 = reservedNop_0F1C
-						0x09,// RM
-							0x07,// HandlerReference
-								0x36,// 0x36 = reservedNop_0F1C
-							0x0E,// Group
-								0x08,// ArrayReference
-									0x3E,// 0x3E = handlers_Grp_0F1C_mem
+						0x0E,// Group
+							0x08,// ArrayReference
+								0x3E,// 0x3E = handlers_Grp_0F1C_mem
 
 				// handlers_Grp_0F1E_reg_lo
 				0x01,// ArrayReference
diff --git a/src/rust/iced-x86/src/decoder/table_de/data_legacy.rs b/src/rust/iced-x86/src/decoder/table_de/data_legacy.rs
index d35c07862..43f92f01c 100644
--- a/src/rust/iced-x86/src/decoder/table_de/data_legacy.rs
+++ b/src/rust/iced-x86/src/decoder/table_de/data_legacy.rs
@@ -2554,12 +2554,9 @@ pub(super) static TBL_DATA: &[u8] = &[
 	0x09,// RM
 		0x07,// HandlerReference
 			0x31,// 0x31 = reservedNop_0F0D
-		0x09,// RM
-			0x07,// HandlerReference
-				0x31,// 0x31 = reservedNop_0F0D
-			0x0E,// Group
-				0x08,// ArrayReference
-					0x3A,// 0x3A = handlers_Grp_0F0D_mem
+		0x0E,// Group
+			0x08,// ArrayReference
+				0x3A,// 0x3A = handlers_Grp_0F0D_mem
 
 	// handlers_Grp_0F18_mem
 	0x01,// ArrayReference
@@ -2594,12 +2591,9 @@ pub(super) static TBL_DATA: &[u8] = &[
 		0x09,// RM
 			0x07,// HandlerReference
 				0x32,// 0x32 = reservedNop_0F18
-			0x09,// RM
-				0x07,// HandlerReference
-					0x32,// 0x32 = reservedNop_0F18
-				0x0E,// Group
-					0x08,// ArrayReference
-						0x3C,// 0x3C = handlers_Grp_0F18_mem
+			0x0E,// Group
+				0x08,// ArrayReference
+					0x3C,// 0x3C = handlers_Grp_0F18_mem
 
 	// handlers_Grp_0F1C_mem
 	0x01,// ArrayReference
@@ -2626,12 +2620,9 @@ pub(super) static TBL_DATA: &[u8] = &[
 		0x09,// RM
 			0x07,// HandlerReference
 				0x36,// 0x36 = reservedNop_0F1C
-			0x09,// RM
-				0x07,// HandlerReference
-					0x36,// 0x36 = reservedNop_0F1C
-				0x0E,// Group
-					0x08,// ArrayReference
-						0x3E,// 0x3E = handlers_Grp_0F1C_mem
+			0x0E,// Group
+				0x08,// ArrayReference
+					0x3E,// 0x3E = handlers_Grp_0F1C_mem
 
 	// handlers_Grp_0F1E_reg_lo
 	0x01,// ArrayReference