diff --git a/Modules/ExtendedPlayerControl.cs b/Modules/ExtendedPlayerControl.cs
index 8fa2b42..5a60230 100644
--- a/Modules/ExtendedPlayerControl.cs
+++ b/Modules/ExtendedPlayerControl.cs
@@ -114,10 +114,10 @@ static class ExtendedPlayerControl
             player.RpcSetName(setReasonInfo + "<size=0%>");
         }
 
-        byte savePlayerId = player.PlayerId;
+        NetworkedPlayerInfo playerData = player.Data;
         string saveName = player.Data.PlayerName;
         AmongUsClient.Instance.KickPlayer(player.GetClientId(), ban);
-        GameData.Instance.GetPlayerById(savePlayerId).PlayerName = saveName;
+        playerData.PlayerName = saveName;
     }
 
     // RPCs