diff --git a/source/RISCV/specialize.h b/source/RISCV/specialize.h
index 3a58f43..0b32980 100644
--- a/source/RISCV/specialize.h
+++ b/source/RISCV/specialize.h
@@ -56,7 +56,7 @@ struct commonNaN { char _unused; };
 /*----------------------------------------------------------------------------
 | The bit pattern for a default generated 32-bit floating-point NaN.
 *----------------------------------------------------------------------------*/
-#define defaultNaNF32UI 0xFFFFFFFF
+#define defaultNaNF32UI 0x7FC00000
 
 /*----------------------------------------------------------------------------
 | Returns true when 32-bit unsigned integer `uiA' has the bit pattern of a
@@ -91,7 +91,7 @@ uint_fast32_t
 /*----------------------------------------------------------------------------
 | The bit pattern for a default generated 64-bit floating-point NaN.
 *----------------------------------------------------------------------------*/
-#define defaultNaNF64UI UINT64_C( 0xFFFFFFFFFFFFFFFF )
+#define defaultNaNF64UI UINT64_C( 0x7FF8000000000000 )
 
 /*----------------------------------------------------------------------------
 | Returns true when 64-bit unsigned integer `uiA' has the bit pattern of a
@@ -126,8 +126,8 @@ uint_fast64_t
 /*----------------------------------------------------------------------------
 | The bit pattern for a default generated 80-bit extended floating-point NaN.
 *----------------------------------------------------------------------------*/
-#define defaultNaNExtF80UI64 0xFFFF
-#define defaultNaNExtF80UI0  UINT64_C( 0xFFFFFFFFFFFFFFFF )
+#define defaultNaNExtF80UI64 0x7FFF
+#define defaultNaNExtF80UI0  UINT64_C( 0xC000000000000000 )
 
 /*----------------------------------------------------------------------------
 | Returns true when the 80-bit unsigned integer formed from concatenating
@@ -191,8 +191,8 @@ struct uint128
 /*----------------------------------------------------------------------------
 | The bit pattern for a default generated 128-bit floating-point NaN.
 *----------------------------------------------------------------------------*/
-#define defaultNaNF128UI64 UINT64_C( 0xFFFFFFFFFFFFFFFF )
-#define defaultNaNF128UI0  UINT64_C( 0xFFFFFFFFFFFFFFFF )
+#define defaultNaNF128UI64 UINT64_C( 0x7FFF800000000000 )
+#define defaultNaNF128UI0  UINT64_C( 0 )
 
 /*----------------------------------------------------------------------------
 | Returns true when the 128-bit unsigned integer formed from concatenating