diff --git a/src/main/java/emu/lunarcore/game/avatar/AvatarStorage.java b/src/main/java/emu/lunarcore/game/avatar/AvatarStorage.java
index 92132b5..2bd0b75 100644
--- a/src/main/java/emu/lunarcore/game/avatar/AvatarStorage.java
+++ b/src/main/java/emu/lunarcore/game/avatar/AvatarStorage.java
@@ -72,7 +72,7 @@ public class AvatarStorage extends BasePlayerManager implements Iterable<GameAva
     /**
      * Updates hero types for players. Will create hero types if they dont exist already.
      */
-    public void setupHeroPaths() {
+    public void validateHeroPaths() {
         for (HeroExcel heroExcel : GameData.getHeroExcelMap().values()) {
             if (getHeroPaths().containsKey(heroExcel.getId())) continue;
             
@@ -108,6 +108,9 @@ public class AvatarStorage extends BasePlayerManager implements Iterable<GameAva
             this.heroPaths.put(heroPath.getId(), heroPath);
         });
         
+        // Setup hero paths if they dont exist
+        this.validateHeroPaths();
+        
         // Load avatars
         Stream<GameAvatar> stream = LunarCore.getGameDatabase().getObjects(GameAvatar.class, "ownerUid", this.getPlayer().getUid());
 
diff --git a/src/main/java/emu/lunarcore/game/player/Player.java b/src/main/java/emu/lunarcore/game/player/Player.java
index 90631a7..8c85f78 100644
--- a/src/main/java/emu/lunarcore/game/player/Player.java
+++ b/src/main/java/emu/lunarcore/game/player/Player.java
@@ -150,7 +150,7 @@ public class Player {
         this.gachaInfo = new PlayerGachaInfo();
         
         // Setup hero paths
-        this.getAvatars().setupHeroPaths();
+        this.getAvatars().validateHeroPaths();
 
         // Give us the main character
         // TODO script tutorial
@@ -622,9 +622,6 @@ public class Player {
         this.getChallengeManager().loadFromDatabase();
         this.getRogueManager().loadFromDatabase();
         
-        // Post database load
-        this.getAvatars().setupHeroPaths();
-        
         // Update stamina
         this.updateStamina();