diff --git a/arduino/library-arduino.json b/arduino/library-arduino.json
index 822e28f84..372b8267a 100644
--- a/arduino/library-arduino.json
+++ b/arduino/library-arduino.json
@@ -1,6 +1,6 @@
 {
   "name": "Embedded Template Library - Arduino",
-  "version": "20.38.4",
+  "version": "20.38.7",
   "authors": {
     "name": "John Wellbelove",
     "email": "john.wellbelove@etlcpp.com"
diff --git a/arduino/library-arduino.properties b/arduino/library-arduino.properties
index 41ce4dfd1..e758c5843 100644
--- a/arduino/library-arduino.properties
+++ b/arduino/library-arduino.properties
@@ -1,5 +1,5 @@
 name=Embedded Template Library - Arduino
-version=20.38.4
+version=20.38.7
 author= John Wellbelove <john.wellbelove@etlcpp.com>
 maintainer=John Wellbelove <john.wellbelove@etlcpp.com>
 license=MIT
diff --git a/include/etl/math.h b/include/etl/math.h
index 605253115..401366d09 100644
--- a/include/etl/math.h
+++ b/include/etl/math.h
@@ -49,7 +49,7 @@ namespace etl
   //***************************************************************************
   // is_nan
   //***************************************************************************
-#if ETL_USING_CPP11
+#if ETL_USING_CPP11 && !defined(ETL_NO_CPP_NAN_SUPPORT)
   template <typename T>
   ETL_CONSTEXPR
     typename etl::enable_if<etl::is_floating_point<T>::value, bool>::type
@@ -80,7 +80,7 @@ namespace etl
   //***************************************************************************
   // is_infinity
   //***************************************************************************
-#if ETL_USING_CPP11
+#if ETL_USING_CPP11 && !defined(ETL_NO_CPP_NAN_SUPPORT)
   template <typename T>
   ETL_CONSTEXPR
   typename etl::enable_if<etl::is_floating_point<T>::value, bool>::type
@@ -112,7 +112,7 @@ namespace etl
   //***************************************************************************
   // is_zero
   //***************************************************************************
-#if ETL_USING_CPP11
+#if ETL_USING_CPP11 && !defined(ETL_NO_CPP_NAN_SUPPORT)
   template <typename T>
   ETL_CONSTEXPR
   typename etl::enable_if<etl::is_floating_point<T>::value, bool>::type
diff --git a/include/etl/version.h b/include/etl/version.h
index 34c8a0034..ee2d2e575 100644
--- a/include/etl/version.h
+++ b/include/etl/version.h
@@ -40,7 +40,7 @@ SOFTWARE.
 
 #define ETL_VERSION_MAJOR 20
 #define ETL_VERSION_MINOR 38
-#define ETL_VERSION_PATCH 7
+#define ETL_VERSION_PATCH 8
 
 #define ETL_VERSION       ETL_STRING(ETL_VERSION_MAJOR) "." ETL_STRING(ETL_VERSION_MINOR) "." ETL_STRING(ETL_VERSION_PATCH)
 #define ETL_VERSION_W     ETL_WIDE_STRING(ETL_VERSION_MAJOR) L"." ETL_WIDE_STRING(ETL_VERSION_MINOR) L"." ETL_WIDE_STRING(ETL_VERSION_PATCH)
diff --git a/library.json b/library.json
index 8b10082c2..2ff070dca 100644
--- a/library.json
+++ b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "Embedded Template Library",
-  "version": "20.38.7",
+  "version": "20.38.8",
   "authors": {
     "name": "John Wellbelove",
     "email": "john.wellbelove@etlcpp.com"
diff --git a/library.properties b/library.properties
index 94d720b2e..5b8b8e876 100644
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
 name=Embedded Template Library
-version=20.38.7
+version=20.38.8
 author= John Wellbelove <john.wellbelove@etlcpp.com>
 maintainer=John Wellbelove <john.wellbelove@etlcpp.com>
 license=MIT
diff --git a/version.txt b/version.txt
index 0e59b1f25..463cf7dd2 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-20.38.7
+20.38.8