diff --git a/src/ItemData.hh b/src/ItemData.hh
index 2427ba65..2a48cb1b 100644
--- a/src/ItemData.hh
+++ b/src/ItemData.hh
@@ -53,7 +53,7 @@ struct ItemData { // 0x14 bytes
   //   Weapon: 00ZZZZGG SS00AABB AABBAABB 00000000
   //   Armor:  0101ZZ00 FFTTDDDD EEEE0000 00000000
   //   Shield: 0102ZZ00 FFTTDDDD EEEE0000 00000000
-  //   Unit:   0103ZZ00 FF0000RR RR000000 00000000
+  //   Unit:   0103ZZ00 FF00RRRR 00000000 00000000
   //   Mag:    02ZZLLWW HHHHIIII JJJJKKKK YYQQPPVV
   //   Tool:   03ZZZZFF 00CC0000 00000000 00000000
   //   Meseta: 04000000 00000000 00000000 MMMMMMMM
diff --git a/src/ItemNameIndex.cc b/src/ItemNameIndex.cc
index 922d0fab..193b9722 100644
--- a/src/ItemNameIndex.cc
+++ b/src/ItemNameIndex.cc
@@ -250,7 +250,7 @@ std::string ItemNameIndex::describe_item(
     // For armors, add the slots, unit modifiers, and/or DEF/EVP bonuses
   } else if (item.data1[0] == 0x01) {
     if (item.data1[1] == 0x03) { // Units
-      uint16_t modifier = (item.data1[8] << 8) | item.data1[7];
+      uint16_t modifier = item.data1w[3];
       if (modifier == 0x0001 || modifier == 0x0002) {
         ret_tokens.back().append("+");
       } else if (modifier == 0x0003 || modifier == 0x0004) {