diff --git a/src/client.cpp b/src/client.cpp
index edce25381..a5ed6f61b 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -1417,7 +1417,7 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
 				for all added objects {
 					u16 id
 					u8 type
-					u16 initialization data length
+					u32 initialization data length
 					string initialization data
 				}
 			*/
diff --git a/src/clientserver.h b/src/clientserver.h
index 9b8b45c85..2b7c0e642 100644
--- a/src/clientserver.h
+++ b/src/clientserver.h
@@ -90,6 +90,7 @@ enum ToClientCommand
 		u16 command
 		u16 number of player positions
 		for each player:
+			u16 peer_id
 			v3s32 position*100
 			v3s32 speed*100
 			s32 pitch*100
@@ -124,7 +125,7 @@ enum ToClientCommand
 		for all added objects {
 			u16 id
 			u8 type
-			u16 initialization data length
+			u32 initialization data length
 			string initialization data
 		}
 	*/
diff --git a/src/server.cpp b/src/server.cpp
index 6bcd1d058..97eaa3a3e 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -774,6 +774,7 @@ void RemoteClient::SendObjectData(
 		u16 command
 		u16 number of player positions
 		for each player:
+			u16 peer_id
 			v3s32 position*100
 			v3s32 speed*100
 			s32 pitch*100