diff --git a/src/main/java/emu/lunarcore/game/avatar/AvatarStorage.java b/src/main/java/emu/lunarcore/game/avatar/AvatarStorage.java
index 1fc9bc1..873ed24 100644
--- a/src/main/java/emu/lunarcore/game/avatar/AvatarStorage.java
+++ b/src/main/java/emu/lunarcore/game/avatar/AvatarStorage.java
@@ -32,6 +32,10 @@ public class AvatarStorage extends BasePlayerManager implements Iterable<GameAva
     }
 
     public GameAvatar getAvatarById(int id) {
+        if (this.getHeroPaths().containsKey(id)) {
+            id = GameConstants.TRAILBLAZER_AVATAR_ID;
+        }
+        
         return getAvatars().get(id);
     }
 
diff --git a/src/main/java/emu/lunarcore/game/inventory/GameItem.java b/src/main/java/emu/lunarcore/game/inventory/GameItem.java
index 94657ec..254e0b0 100644
--- a/src/main/java/emu/lunarcore/game/inventory/GameItem.java
+++ b/src/main/java/emu/lunarcore/game/inventory/GameItem.java
@@ -280,6 +280,7 @@ public class GameItem {
                 .setIsProtected(this.isLocked())
                 .setIsDiscarded(this.isDiscarded())
                 .setBaseAvatarId(this.getEquipAvatar())
+                .setEquipAvatarId(this.getEquipAvatar())
                 .setMainAffixId(this.mainAffix);
 
         if (this.subAffixes != null) {
@@ -300,7 +301,8 @@ public class GameItem {
                 .setIsProtected(this.isLocked())
                 .setPromotion(this.getPromotion())
                 .setRank(this.getRank())
-                .setBaseAvatarId(this.getEquipAvatar());
+                .setBaseAvatarId(this.getEquipAvatar())
+                .setEquipAvatarId(this.getEquipAvatar());
         
         return proto;
     }