diff --git a/UnicodeInformation.Builder/UnicodeInfoBuilder.cs b/UnicodeInformation.Builder/UnicodeInfoBuilder.cs
index b3ef64a..f169dad 100644
--- a/UnicodeInformation.Builder/UnicodeInfoBuilder.cs
+++ b/UnicodeInformation.Builder/UnicodeInfoBuilder.cs
@@ -269,8 +269,8 @@ namespace System.Unicode.Builder
 		{
 			using (var writer = new BinaryWriter(stream, Encoding.UTF8, true))
 			{
-				writer.Write(new byte[] { (byte)'U', (byte)'C', (byte)'D', 0 });
-				writer.Write((ushort)7);
+				writer.Write(new byte[] { (byte)'U', (byte)'C', (byte)'D', 1 });
+				writer.Write((ushort)7); // Hardcode Unicode 7.0
 				writer.Write((byte)0);
 				writer.WriteCodePoint(ucdEntryCount);
 				for (int i = 0; i < ucdEntryCount; ++i)
diff --git a/UnicodeInformation/UnicodeInfo.cs b/UnicodeInformation/UnicodeInfo.cs
index 321e8e2..cf0d9f0 100644
--- a/UnicodeInformation/UnicodeInfo.cs
+++ b/UnicodeInformation/UnicodeInfo.cs
@@ -34,9 +34,7 @@ namespace System.Unicode
 
 				byte formatVersion = reader.ReadByte();
 
-#if !DEBUG
 				if (formatVersion != 1) throw new InvalidDataException();
-#endif
 
 				var unicodeVersion = new Version(reader.ReadUInt16(), reader.ReadByte());
 
diff --git a/UnicodeInformation/ucd.dat b/UnicodeInformation/ucd.dat
index eafc938..a0e3743 100644
Binary files a/UnicodeInformation/ucd.dat and b/UnicodeInformation/ucd.dat differ