diff --git a/CMakeLists.txt b/CMakeLists.txt
index 068a4b27..11b1521f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.16.3)
 project(Elastix)
 
-if(NOT CMAKE_CXX_STANDARD)
+if(NOT CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD LESS 17)
   # SuperElastix/elastix uses C++17 specific features in some of its header files.
   set(CMAKE_CXX_STANDARD 17)
 endif()
@@ -56,7 +56,7 @@ if(SKBUILD)
 endif()
 
 set(elastix_GIT_REPOSITORY "https://github.com/SuperElastix/elastix.git")
-set(elastix_GIT_TAG "b9b8e20aef83f94ed38a81cc38625a1bfddf1053")
+set(elastix_GIT_TAG "115d8e1c7b0b23973bfc919a2bf4768f32e4e843")
 FetchContent_Declare(
   elx
   GIT_REPOSITORY ${elastix_GIT_REPOSITORY}