diff --git a/cmake/cmlib b/cmake/cmlib
index c6414bb..63c433a 160000
--- a/cmake/cmlib
+++ b/cmake/cmlib
@@ -1 +1 @@
-Subproject commit c6414bbc03c924379ceb7c7d7c914f4853e5d528
+Subproject commit 63c433a82e51e90796a74bd58939c5e879e7bcd6
diff --git a/src/myx/backports/cpp/span.hpp b/src/myx/backports/cpp/span.hpp
index 6400671..d91ae76 100644
--- a/src/myx/backports/cpp/span.hpp
+++ b/src/myx/backports/cpp/span.hpp
@@ -12,7 +12,11 @@
 
 #pragma once
 
-#if ( __cplusplus >= 201103L ) && ( __cplusplus < 201703L )
+#if ( __cplusplus > 201703L )
+
+#include <span>
+
+#else
 
 #include <myx/backports/cpp/helpers.hpp>
 
@@ -222,6 +226,6 @@ public:
 
 } // namespace std
 
-#endif // if ( __cplusplus >= 201103L ) && ( __cplusplus < 201703L )
+#endif // if ( __cplusplus > 201703L )
 
 #endif // ifndef MYX_BACKPORTS_CPP_SPAN_HPP_