diff --git a/Base/include/VectorBase.h b/Base/include/VectorBase.h
index c9e4ace..945e176 100644
--- a/Base/include/VectorBase.h
+++ b/Base/include/VectorBase.h
@@ -94,7 +94,8 @@ namespace FasTC {
     }
 
     T LengthSq() const { return this->Dot(*this); }
-    T Length() const { return static_cast<T>(sqrt(LengthSq())); }
+    T Length() const { return static_cast<T>(
+      sqrt(static_cast<long double>(LengthSq())));}
 
     void Normalize() {
       T len = Length();
diff --git a/Base/test/TestVector.cpp b/Base/test/TestVector.cpp
index 1dcb1b4..b3d2176 100644
--- a/Base/test/TestVector.cpp
+++ b/Base/test/TestVector.cpp
@@ -179,7 +179,7 @@ TEST(VectorBase, Normalization) {
   EXPECT_EQ(v2u[0], static_cast<unsigned>(1));
   EXPECT_EQ(v2u[1], static_cast<unsigned>(1));
 
-  const double sqrt2 = sqrt(2)/2.0f;
+  const double sqrt2 = sqrt(2.0f)/2.0f;
   for(int i = 2; i < 10; i++) {
     v2f[0] = static_cast<float>(i);
     v2f[1] = static_cast<float>(i);