diff --git a/robots/hydrus_xi/CMakeLists.txt b/robots/hydrus_xi/CMakeLists.txt
index 8b3fef063..a268354b4 100644
--- a/robots/hydrus_xi/CMakeLists.txt
+++ b/robots/hydrus_xi/CMakeLists.txt
@@ -1,10 +1,10 @@
 cmake_minimum_required(VERSION 3.0.2)
 project(hydrus_xi)
 
-#add_compile_options(-std=c++17)
+add_compile_options(-std=c++17)
 # Workaround for the build error that "add_compile_options(-std=c++17)" does not work, because of unknown -std=gnu++14 flag
 # maybe because of osqp or osqp-eigen
-set(CMAKE_CXX_STANDARD 17)
+#set(CMAKE_CXX_STANDARD 17)
 
 find_package(catkin REQUIRED COMPONENTS
   angles