diff --git a/include/armadillo_bits/arrayops_meat.hpp b/include/armadillo_bits/arrayops_meat.hpp
index e5d7beda..57f1a1d4 100644
--- a/include/armadillo_bits/arrayops_meat.hpp
+++ b/include/armadillo_bits/arrayops_meat.hpp
@@ -898,7 +898,7 @@ inline
 eT
 arrayops::accumulate(const eT* src, const uword n_elem)
   {
-  #if defined(__FINITE_MATH_ONLY__) && (__FINITE_MATH_ONLY__ > 0)
+  #if defined(__FAST_MATH__)
     {
     eT acc = eT(0);
     
diff --git a/include/armadillo_bits/fn_accu.hpp b/include/armadillo_bits/fn_accu.hpp
index fabf6c67..957459cd 100644
--- a/include/armadillo_bits/fn_accu.hpp
+++ b/include/armadillo_bits/fn_accu.hpp
@@ -70,7 +70,7 @@ accu_proxy_linear(const Proxy<T1>& P)
     }
   else
     {
-    #if defined(__FINITE_MATH_ONLY__) && (__FINITE_MATH_ONLY__ > 0)
+    #if defined(__FAST_MATH__)
       {
       if(P.is_aligned())
         {
@@ -643,7 +643,7 @@ accu_cube_proxy_linear(const ProxyCube<T1>& P)
     }
   else
     {
-    #if defined(__FINITE_MATH_ONLY__) && (__FINITE_MATH_ONLY__ > 0)
+    #if defined(__FAST_MATH__)
       {
       if(P.is_aligned())
         {
diff --git a/include/armadillo_bits/op_dot_meat.hpp b/include/armadillo_bits/op_dot_meat.hpp
index 2b21b6a0..e94c76d8 100644
--- a/include/armadillo_bits/op_dot_meat.hpp
+++ b/include/armadillo_bits/op_dot_meat.hpp
@@ -29,7 +29,7 @@ op_dot::direct_dot_arma(const uword n_elem, const eT* const A, const eT* const B
   {
   arma_extra_debug_sigprint();
   
-  #if defined(__FINITE_MATH_ONLY__) && (__FINITE_MATH_ONLY__ > 0)
+  #if defined(__FAST_MATH__)
     {
     eT val = eT(0);
     
diff --git a/include/armadillo_bits/op_norm_meat.hpp b/include/armadillo_bits/op_norm_meat.hpp
index 8c6f8c49..2f50f14c 100644
--- a/include/armadillo_bits/op_norm_meat.hpp
+++ b/include/armadillo_bits/op_norm_meat.hpp
@@ -255,7 +255,7 @@ op_norm::vec_norm_1_direct_mem(const uword N, const eT* A)
   {
   arma_extra_debug_sigprint();
   
-  #if defined(ARMA_SIMPLE_LOOPS) || (defined(__FINITE_MATH_ONLY__) && (__FINITE_MATH_ONLY__ > 0))
+  #if (defined(ARMA_SIMPLE_LOOPS) || defined(__FAST_MATH__))
     {
     eT acc1 = eT(0);
     
@@ -565,7 +565,7 @@ op_norm::vec_norm_2_direct_mem(const uword N, const eT* A)
   
   eT acc;
   
-  #if defined(ARMA_SIMPLE_LOOPS) || (defined(__FINITE_MATH_ONLY__) && (__FINITE_MATH_ONLY__ > 0))
+  #if (defined(ARMA_SIMPLE_LOOPS) || defined(__FAST_MATH__))
     {
     eT acc1 = eT(0);