diff --git a/arch/TMS320C64x/TMS320C64xMapping.c b/arch/TMS320C64x/TMS320C64xMapping.c
index 19497fa7f..e09a49d48 100644
--- a/arch/TMS320C64x/TMS320C64xMapping.c
+++ b/arch/TMS320C64x/TMS320C64xMapping.c
@@ -1766,9 +1766,16 @@ static name_map group_name_maps[] = {
 const char *TMS320C64x_group_name(csh handle, unsigned int id)
 {
 #ifndef CAPSTONE_DIET
+	unsigned int i;
+
 	if (id >= TMS320C64X_GRP_ENDING)
 		return NULL;
 
+	for (i = 0; i < ARR_SIZE(group_name_maps); i++) {
+		if (group_name_maps[i].id == id)
+			return group_name_maps[i].name;
+	}
+
 	return group_name_maps[id].name;
 #else
 	return NULL;