diff --git a/src/Shared/HandyControl_Shared/Media/Animation/GeometryAnimation.cs b/src/Shared/HandyControl_Shared/Media/Animation/GeometryAnimation.cs
index 91affe56..3c9d7f3e 100644
--- a/src/Shared/HandyControl_Shared/Media/Animation/GeometryAnimation.cs
+++ b/src/Shared/HandyControl_Shared/Media/Animation/GeometryAnimation.cs
@@ -4,8 +4,8 @@ using System.Windows;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
 using HandyControl.Tools;
-// ReSharper disable PossibleInvalidOperationException
 
+// ReSharper disable PossibleInvalidOperationException
 namespace HandyControl.Media.Animation
 {
     public class GeometryAnimation : GeometryAnimationBase
@@ -20,7 +20,7 @@ namespace HandyControl.Media.Animation
 
         public GeometryAnimation()
         {
-            System.Threading.Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
+            
         }
 
         public GeometryAnimation(string fromValue, string toValue) : this()
diff --git a/src/Shared/HandyControl_Shared/Media/Animation/GeometryAnimationBase.cs b/src/Shared/HandyControl_Shared/Media/Animation/GeometryAnimationBase.cs
index eee8c262..630c8257 100644
--- a/src/Shared/HandyControl_Shared/Media/Animation/GeometryAnimationBase.cs
+++ b/src/Shared/HandyControl_Shared/Media/Animation/GeometryAnimationBase.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Globalization;
+using System.Threading;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
 
@@ -6,6 +8,11 @@ namespace HandyControl.Media.Animation
 {
     public abstract class GeometryAnimationBase : AnimationTimeline
     {
+        protected GeometryAnimationBase()
+        {
+            Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
+        }
+
         public new GeometryAnimationBase Clone() => (GeometryAnimationBase)base.Clone();
 
         public sealed override object GetCurrentValue(object defaultOriginValue, object defaultDestinationValue, AnimationClock animationClock)
diff --git a/src/Shared/HandyControl_Shared/Media/Animation/GeometryAnimationUsingKeyFrames.cs b/src/Shared/HandyControl_Shared/Media/Animation/GeometryAnimationUsingKeyFrames.cs
index b26ecb17..c58a8c3e 100644
--- a/src/Shared/HandyControl_Shared/Media/Animation/GeometryAnimationUsingKeyFrames.cs
+++ b/src/Shared/HandyControl_Shared/Media/Animation/GeometryAnimationUsingKeyFrames.cs
@@ -11,7 +11,6 @@ using System.Windows.Media.Animation;
 using HandyControl.Tools;
 
 // ReSharper disable PossibleInvalidOperationException
-
 namespace HandyControl.Media.Animation
 {
     [ContentProperty("KeyFrames")]
@@ -40,7 +39,6 @@ namespace HandyControl.Media.Animation
 
         public GeometryAnimationUsingKeyFrames()
         {
-            System.Threading.Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
             _areKeyTimesValid = true;
         }