diff --git a/src/main.cpp b/src/main.cpp
index 195f47f..883a1c3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -40,8 +40,8 @@ void Save(const td::protocol::PacketBase& header, const td::protocol::PacketBase
 
 	sp::MessageStream<td::protocol::PacketFactory> stream(std::move(out), std::move(comp));
 
-	stream.WriteMessage(header);
-	stream.WriteMessage(data);
+	stream.WriteMessage(header, false);
+	stream.WriteMessage(data, false);
 }
 
 td::game::World GetWorld() {
@@ -52,8 +52,8 @@ td::game::World GetWorld() {
 
 	sp::MessageStream<td::protocol::PacketFactory> stream(std::move(out), std::move(comp));
 
-	auto header = stream.ReadMessage();
-	auto data = stream.ReadMessage();
+	auto header = stream.ReadMessage(td::protocol::PacketID::WorldHeader);
+	auto data = stream.ReadMessage(td::protocol::PacketID::WorldData);
 
 	td::game::World w;
 	WorldApply wa(w);
diff --git a/test/tdmap.tdmap2 b/test/tdmap.tdmap2
index 5df803c..cc9a223 100644
Binary files a/test/tdmap.tdmap2 and b/test/tdmap.tdmap2 differ