diff --git a/src/core/include/units/math.h b/src/core/include/units/math.h
index 56818c10..8573766f 100644
--- a/src/core/include/units/math.h
+++ b/src/core/include/units/math.h
@@ -273,7 +273,7 @@ template<Quantity Q1, Quantity Q2>
 {
   using std::hypot;
   using type = quantity<common_reference(Q1::reference, Q2::reference), decltype(hypot(x.number(), y.number()))>;
-  return type{hypot(x.number(), y.number())};
+  return type{hypot(type{x}.number(), type{y}.number())};
 }
 
 /**
@@ -291,7 +291,7 @@ template<Quantity Q1, Quantity Q2, Quantity Q3>
   using std::hypot;
   using type = quantity<common_reference(Q1::reference, Q2::reference, Q3::reference),
                         decltype(hypot(x.number(), y.number(), z.number()))>;
-  return type{hypot(x.number(), y.number(), z.number())};
+  return type{hypot(type{x}.number(), type{y}.number(), type{z}.number())};
 }
 
 }  // namespace units