diff --git a/source/BlockArea.cpp b/source/BlockArea.cpp
index c39819b4..472b14c5 100644
--- a/source/BlockArea.cpp
+++ b/source/BlockArea.cpp
@@ -293,6 +293,11 @@ bool cBlockArea::SaveToSchematicFile(const AString & a_FileName)
 		AString Dummy(GetBlockCount(), 0);
 		Writer.AddByteArray("Data", Dummy.data(), Dummy.size());
 	}
+	// TODO: Save entities and block entities
+	Writer.BeginList("Entities", TAG_Compound);
+	Writer.EndList();
+	Writer.BeginList("TileEntities", TAG_Compound);
+	Writer.EndList();
 	Writer.Finish();
 	
 	// TODO: Save to file