diff --git a/AnotherReplayReader.csproj b/AnotherReplayReader.csproj
index 9cc1512..3bf032b 100644
--- a/AnotherReplayReader.csproj
+++ b/AnotherReplayReader.csproj
@@ -15,6 +15,7 @@
     <Deterministic>true</Deterministic>
     <TargetFrameworkProfile />
     <IsWebBootstrapper>false</IsWebBootstrapper>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -30,7 +31,6 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -180,7 +180,7 @@
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.6.1">
       <Visible>False</Visible>
-      <ProductName>Microsoft .NET Framework 4.6.1 %28x86 和 x64%29</ProductName>
+      <ProductName>Microsoft .NET Framework 4.6.1 %28x86 and x64%29</ProductName>
       <Install>true</Install>
     </BootstrapperPackage>
     <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
diff --git a/Replay.cs b/Replay.cs
index 65ed3ac..74f672f 100644
--- a/Replay.cs
+++ b/Replay.cs
@@ -309,7 +309,10 @@ namespace AnotherReplayReader
                 var entries = null as Dictionary<string, string>;
                 try
                 {
-                    entries = description.Split(';').Where(x => !string.IsNullOrWhiteSpace(x)).ToDictionary(x => x.Split('=')[0], x => x.Split('=')[1]);
+                    var query = from splitted in description.Split(';')
+                                where !string.IsNullOrWhiteSpace(splitted)
+                                select splitted.Split(new[] { '=' }, 2);
+                    entries = query.ToDictionary(x => x[0], x => x[1]);
                 }
                 catch(Exception exception)
                 {
@@ -319,9 +322,9 @@ namespace AnotherReplayReader
                 try
                 {
                     _players = entries["S"].Split(':')
-                    .TakeWhile(x => !string.IsNullOrWhiteSpace(x) && x[0] != 'X')
-                    .Select(x => new Player(x.Split(',')))
-                    .ToList();
+                        .TakeWhile(x => !string.IsNullOrWhiteSpace(x) && x[0] != 'X')
+                        .Select(x => new Player(x.Split(',')))
+                        .ToList();
                 }
                 catch (Exception exception)
                 {