diff --git a/lib/csharp/src/Protocol/TJSONProtocol.cs b/lib/csharp/src/Protocol/TJSONProtocol.cs
index 5f6351f..a35fcd3 100644
--- a/lib/csharp/src/Protocol/TJSONProtocol.cs
+++ b/lib/csharp/src/Protocol/TJSONProtocol.cs
@@ -23,6 +23,7 @@
 using System.Collections.Generic;
 
 using Thrift.Transport;
+using System.Globalization;
 
 namespace Thrift.Protocol
 {
@@ -503,7 +504,7 @@
 		private void WriteJSONDouble(double num)
 		{
 			context.Write();
-			String str = num.ToString();
+			String str = num.ToString(CultureInfo.InvariantCulture);
 			bool special = false;
 
 			switch (str[0])
@@ -840,7 +841,7 @@
 			if (reader.Peek() == QUOTE[0])
 			{
 				byte[] arr = ReadJSONString(true);
-				double dub = Double.Parse(utf8Encoding.GetString(arr));
+				double dub = Double.Parse(utf8Encoding.GetString(arr), CultureInfo.InvariantCulture);
 
 				if (!context.EscapeNumbers() && !Double.IsNaN(dub) &&
 					!Double.IsInfinity(dub))
