diff --git a/src/fenv/fegetexceptflag.cpp b/src/fenv/fegetexceptflag.cpp
index 06ca56e..24620b0 100644
--- a/src/fenv/fegetexceptflag.cpp
+++ b/src/fenv/fegetexceptflag.cpp
@@ -15,11 +15,8 @@
 namespace __llvm_libc {
 
 LLVM_LIBC_FUNCTION(int, fegetexceptflag, (fexcept_t * flagp, int excepts)) {
-  // Since the return type of fetestexcept is int, we ensure that fexcept_t
-  // matches in size.
-  static_assert(sizeof(int) == sizeof(fexcept_t),
-                "sizeof(fexcept_t) != sizeof(int)");
-  *reinterpret_cast<int *>(flagp) = fputil::testExcept(FE_ALL_EXCEPT) & excepts;
+  // TODO: Add a compile time check to see if the excepts actually fit in flagp.
+  *flagp = static_cast<fexcept_t>(fputil::testExcept(FE_ALL_EXCEPT) & excepts);
   return 0;
 }
 
diff --git a/src/fenv/fesetexceptflag.cpp b/src/fenv/fesetexceptflag.cpp
index 3c88d63..8d44a04 100644
--- a/src/fenv/fesetexceptflag.cpp
+++ b/src/fenv/fesetexceptflag.cpp
@@ -17,9 +17,9 @@
 LLVM_LIBC_FUNCTION(int, fesetexceptflag,
                    (const fexcept_t *flagp, int excepts)) {
   // Since the return type of fetestexcept is int, we ensure that fexcept_t
-  // matches in size.
-  static_assert(sizeof(int) == sizeof(fexcept_t),
-                "sizeof(fexcept_t) != sizeof(int)");
+  // can fit in int type.
+  static_assert(sizeof(int) >= sizeof(fexcept_t),
+                "fexcept_t value cannot fit in an int value.");
   int excepts_to_set = *reinterpret_cast<const int *>(flagp) & excepts;
   return fputil::setExcept(excepts_to_set);
 }