diff --git a/Scripts/Misc/MapDefinitions.cs b/Scripts/Misc/MapDefinitions.cs
index 37ca928f6..ba397ede1 100644
--- a/Scripts/Misc/MapDefinitions.cs
+++ b/Scripts/Misc/MapDefinitions.cs
@@ -39,7 +39,7 @@ namespace Server.Misc
 
 			TileMatrixPatch.Enabled = false; // OSI Client Patch 6.0.0.0
 
-			MultiData.PostHSFormat = true; // OSI Client Patch 7.0.9.0
+			MultiComponentList.PostHSFormat = true; // OSI Client Patch 7.0.9.0
 		}
 
 		public static void RegisterMap( int mapIndex, int mapID, int fileIndex, int width, int height, int season, string name, MapRules rules )
diff --git a/Server/MultiData.cs b/Server/MultiData.cs
index 3e7423cb1..901ffe379 100644
--- a/Server/MultiData.cs
+++ b/Server/MultiData.cs
@@ -26,13 +26,6 @@ namespace Server
 {
 	public class MultiData
 	{
-		public static bool PostHSFormat {
-			get { return _PostHSFormat; }
-			set { _PostHSFormat = value; }
-		}
-
-		private static bool _PostHSFormat = false;
-
 		private static MultiComponentList[] m_Components;
 
 		private static FileStream m_Index, m_Stream;
@@ -73,7 +66,7 @@ namespace Server
 
 				m_StreamReader.BaseStream.Seek( lookup, SeekOrigin.Begin );
 
-				return new MultiComponentList( m_StreamReader, length / ( _PostHSFormat ? 16 : 12 ) );
+				return new MultiComponentList( m_StreamReader, length / ( MultiComponentList.PostHSFormat ? 16 : 12 ) );
 			}
 			catch
 			{
@@ -155,6 +148,13 @@ namespace Server
 
 	public sealed class MultiComponentList
 	{
+		public static bool PostHSFormat {
+			get { return _PostHSFormat; }
+			set { _PostHSFormat = value; }
+		}
+
+		private static bool _PostHSFormat = false;
+
 		private Point2D m_Min, m_Max, m_Center;
 		private int m_Width, m_Height;
 		private Tile[][][] m_Tiles;
@@ -532,7 +532,7 @@ namespace Server
 				allTiles[i].m_OffsetZ = reader.ReadInt16();
 				allTiles[i].m_Flags = reader.ReadInt32();
 
-				if ( MultiData.PostHSFormat )
+				if ( _PostHSFormat )
 					reader.ReadInt32(); // ??
 
 				MultiTileEntry e = allTiles[i];