diff --git a/src/main/java/emu/grasscutter/game/avatar/Avatar.java b/src/main/java/emu/grasscutter/game/avatar/Avatar.java
index dd3ff283c..f91a85daa 100644
--- a/src/main/java/emu/grasscutter/game/avatar/Avatar.java
+++ b/src/main/java/emu/grasscutter/game/avatar/Avatar.java
@@ -1019,7 +1019,7 @@ public class Avatar {
                         .putAllSkillLevelMap(this.getSkillLevelMap())
                         .addAllInherentProudSkillList(this.getProudSkillList())
                         .putAllProudSkillExtraLevelMap(this.getProudSkillBonusMap())
-                        .setAvatarType(1)
+                        .setAvatarType(this.getAvatarType())
                         .setBornTime(this.getBornTime())
                         .setFetterInfo(avatarFetter)
                         .setWearingFlycloakId(this.getFlyCloak())
diff --git a/src/main/java/emu/grasscutter/game/player/TeamManager.java b/src/main/java/emu/grasscutter/game/player/TeamManager.java
index 7a05c815b..ff6a9d3fb 100644
--- a/src/main/java/emu/grasscutter/game/player/TeamManager.java
+++ b/src/main/java/emu/grasscutter/game/player/TeamManager.java
@@ -486,7 +486,7 @@ public final class TeamManager extends BasePlayerDataManager {
     public long getTrialAvatarGuid(int avatarId) {
         return getTrialAvatars().values().stream()
                 .filter(avatar -> avatar.getTrialAvatarId() == avatarId)
-                .map(avatar -> avatar.getGuid())
+                .map(Avatar::getGuid)
                 .findFirst()
                 .orElse(0L);
     }