diff --git a/src/engine/objects/CharacterItemManager.java b/src/engine/objects/CharacterItemManager.java
index cc4bae3c..4db4fd51 100644
--- a/src/engine/objects/CharacterItemManager.java
+++ b/src/engine/objects/CharacterItemManager.java
@@ -1892,8 +1892,9 @@ public class CharacterItemManager {
         synchronized (this.equipOrder) {
             synchronized (this.equipped) {
                 for (int slot : this.equipOrder) {
-                    if (this.equipped.containsKey(slot))
-                        ret.add(this.equipped.get(slot));
+                    Enum.EquipSlotType slotType = Enum.EquipSlotType.values()[slot];
+                    if (this.equipped.containsKey(slotType))
+                        ret.add(this.equipped.get(slotType));
                 }
                 if (ret.size() != this.equipped.size())
                     //missed adding some items, figure out what.