diff --git a/.gitmodules b/.gitmodules
index c82cc6e55..9cbc6e379 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,7 +6,8 @@
 	url = https://github.com/gtkwave/gtkwave.git
 [submodule "third_party/exprtk"]
 	path = third_party/exprtk
-	url = https://github.com/ArashPartow/exprtk.git
+    url = https://github.com/ArashPartow/exprtk.git
+    branch = release
 [submodule "third_party/spdlog"]
 	path = third_party/spdlog
 	url = https://github.com/gabime/spdlog.git
diff --git a/src/DeviceModeling/rs_expression_evaluator.h b/src/DeviceModeling/rs_expression_evaluator.h
index a0fad4af7..abc3fb7d4 100644
--- a/src/DeviceModeling/rs_expression_evaluator.h
+++ b/src/DeviceModeling/rs_expression_evaluator.h
@@ -108,7 +108,7 @@ class rs_expression_evaluator {
     symbol_table_t symbol_table;
     expression_t expression;
     expression.register_symbol_table(symbol_table);
-    parser_t parser(settings_t(settings_t::compile_all_opts +
+    parser_t parser(settings_t(settings_t::default_compile_all_opts +
                                settings_t::e_disable_usr_on_rsrvd)
                         .disable_all_base_functions()
                         .disable_all_control_structures());
@@ -178,7 +178,7 @@ class rs_expression_evaluator {
     symbol_table_t symbol_table;
     expression_t expression;
     expression.register_symbol_table(symbol_table);
-    parser_t parser(settings_t(settings_t::compile_all_opts +
+    parser_t parser(settings_t(settings_t::default_compile_all_opts +
                                settings_t::e_disable_usr_on_rsrvd)
                         .disable_all_base_functions()
                         .disable_all_control_structures());
diff --git a/third_party/exprtk b/third_party/exprtk
index f46bffcd6..a4b17d543 160000
--- a/third_party/exprtk
+++ b/third_party/exprtk
@@ -1 +1 @@
-Subproject commit f46bffcd6966d38a09023fb37ba9335214c9b959
+Subproject commit a4b17d543f072d2e3ba564e4bc5c3a0d2b05c338