diff --git a/Network/Player.Networking.cs b/Network/Player.Networking.cs
index 70f1756c9..e103e9ecc 100644
--- a/Network/Player.Networking.cs
+++ b/Network/Player.Networking.cs
@@ -33,12 +33,12 @@ namespace MCGalaxy {
                 int length = p.socket.EndReceive(result);
                 if (length == 0) { p.Disconnect(); return; }
 
-                byte[] allData = new byte[p.buffer.Length + length];
-                Buffer.BlockCopy(p.buffer, 0, allData, 0, p.buffer.Length);
-                Buffer.BlockCopy(p.tempbuffer, 0, allData, p.buffer.Length, length);
-                p.buffer = p.ProcessReceived(allData);
+                byte[] allData = new byte[p.leftBuffer.Length + length];
+                Buffer.BlockCopy(p.leftBuffer, 0, allData, 0, p.leftBuffer.Length);
+                Buffer.BlockCopy(p.tempbuffer, 0, allData, p.leftBuffer.Length, length);
+                p.leftBuffer = p.ProcessReceived(allData);
                 
-                if (p.dontmindme && p.buffer.Length == 0) {
+                if (p.dontmindme && p.leftBuffer.Length == 0) {
                     Server.s.Log("Disconnected");
                     p.socket.Close();
                     p.disconnected = true;
@@ -299,8 +299,8 @@ namespace MCGalaxy {
 
         void SendMapMotd(bool ignoreLevelMotd) {
             byte[] packet = Packet.MakeMotd(this, ignoreLevelMotd);
-            if (OnSendMOTD != null) OnSendMOTD(this, buffer);
-            SendRaw(buffer);
+            if (OnSendMOTD != null) OnSendMOTD(this, packet);
+            SendRaw(packet);
         }
         
         public void SendMap(Level oldLevel) { SendRawMap(oldLevel, level); }
diff --git a/Player/Player.Fields.cs b/Player/Player.Fields.cs
index a8a498bb4..f200e825a 100644
--- a/Player/Player.Fields.cs
+++ b/Player/Player.Fields.cs
@@ -75,7 +75,7 @@ namespace MCGalaxy {
         public string BrushName = "normal", DefaultBrushArgs = "";
         public string afkMessage;
 
-        byte[] buffer = new byte[0];
+        byte[] leftBuffer = new byte[0];
         byte[] tempbuffer = new byte[0xFF];
         public bool disconnected = false;