diff --git a/RageCoop.Server/Client.cs b/RageCoop.Server/Client.cs
index 60e4339..5137672 100644
--- a/RageCoop.Server/Client.cs
+++ b/RageCoop.Server/Client.cs
@@ -209,7 +209,7 @@ namespace RageCoop.Server
         /// Trigger a CustomEvent for this client
         /// </summary>
         /// <param name="hash">An unique identifier of the event, you can use <see cref="CustomEvents.Hash(string)"/> to get it from a string</param>
-        /// <param name="args"></param>
+        /// <param name="args">Arguments</param>
         public void SendCustomEvent(int hash,List<object> args)
         {
             if (!IsReady)
@@ -234,6 +234,11 @@ namespace RageCoop.Server
                 Server.Logger?.Error(ex);
             }
         }
+        /// <summary>
+        /// Trigger a CustomEvent for this client
+        /// </summary>
+        /// <param name="hash">An unique identifier of the event, you can use <see cref="CustomEvents.Hash(string)"/> to get it from a string</param>
+        /// <param name="args">Arguments</param>
         public void SendCustomEvent(int hash,params object[] args)
         {
             if (!IsReady)
diff --git a/RageCoop.Server/Server.cs b/RageCoop.Server/Server.cs
index ee42b7a..1f231c5 100644
--- a/RageCoop.Server/Server.cs
+++ b/RageCoop.Server/Server.cs
@@ -599,16 +599,18 @@ namespace RageCoop.Server
             // Add the player to Players
             lock (Clients)
             {
+                var player = new ServerPed
+                {
+                    ID= packet.PedID,
+                };
+                Entities.Add(player);
                 Clients.Add(connection.RemoteUniqueIdentifier,
                     tmpClient = new Client(this)
                     {
                         NetID = connection.RemoteUniqueIdentifier,
                         Connection=connection,
                         Username=packet.Username,
-                        Player = new()
-                        {
-                            ID= packet.PedID,
-                        }
+                        Player = player
                     }
                 );;
             }
diff --git a/RageCoop.Server/ServerEntities.cs b/RageCoop.Server/ServerEntities.cs
index 3a0a96a..6187a24 100644
--- a/RageCoop.Server/ServerEntities.cs
+++ b/RageCoop.Server/ServerEntities.cs
@@ -146,7 +146,7 @@ namespace RageCoop.Server
         public ServerObject[] GetAllObjects()
         {
             return ServerObjects.Values.ToArray();
-        }
+        } 
 
         /// <summary>
         /// Not thread safe
@@ -224,5 +224,17 @@ namespace RageCoop.Server
             // Server.Logger?.Trace($"Removing ped:{id}");
             if (Peds.ContainsKey(id)) { Peds.Remove(id); }
         }
+
+        internal void Add(ServerPed ped)
+        {
+            if (Peds.ContainsKey(ped.ID))
+            {
+                Peds[ped.ID]=ped;
+            }
+            else
+            {
+                Peds.Add(ped.ID, ped);
+            }
+        }
     }
 }
diff --git a/RageCoop.Server/ServerSettings.cs b/RageCoop.Server/ServerSettings.cs
index 736d9be..ecdf3b4 100644
--- a/RageCoop.Server/ServerSettings.cs
+++ b/RageCoop.Server/ServerSettings.cs
@@ -42,7 +42,7 @@
         /// <summary>
         /// NPC data won't be sent to a player if their distance is greater than this value. -1 for unlimited.
         /// </summary>
-        public float NpcStreamingDistance { get; set; } = 500;
+        public float NpcStreamingDistance { get; set; } = 500 ;
         /// <summary>
         /// Player's data won't be sent to another player if their distance is greater than this value. -1 for unlimited.
         /// </summary>