diff --git a/DESCRIPTION b/DESCRIPTION
index 27ea14cf..f573ee07 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -43,7 +43,7 @@ Imports:
     posterior,
     bayesplot
 LinkingTo: 
-    BH (>= 1.84.0-0),
+    BH (>= 1.87.0-0),
     Rcpp (>= 0.10.0),
     RcppEigen (>= 0.3.4.0.0),
     RcppSpdlog,
diff --git a/src/Makevars.ucrt b/src/Makevars.ucrt
index e8c2c041..3fbf7929 100644
--- a/src/Makevars.ucrt
+++ b/src/Makevars.ucrt
@@ -1,4 +1,4 @@
-PKG_CPPFLAGS = -I../inst/include -DEIGEN_PERMANENTLY_DISABLE_STUPID_WARNINGS -DBOOST_DISABLE_ASSERTS -DUSE_RCPP
+PKG_CPPFLAGS = -I../inst/include -DEIGEN_PERMANENTLY_DISABLE_STUPID_WARNINGS -DBOOST_ENABLE_ASSERT_HANDLER -DUSE_RCPP
 PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS)
 
 PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
diff --git a/src/Makevars.win b/src/Makevars.win
index cd0a8cb6..91e304b9 100644
--- a/src/Makevars.win
+++ b/src/Makevars.win
@@ -2,7 +2,7 @@
 # Add -DBOOST_DISABLE_ASSERTS against assertion failures made by boost library
 # If -DEIGEN_DONT_PARALLELIZE added, multi-threading will be disabled related to OpenMP.
 # In this package we use the same number of threads specified in OpenMP
-PKG_CPPFLAGS = -I../inst/include -DEIGEN_PERMANENTLY_DISABLE_STUPID_WARNINGS -DBOOST_DISABLE_ASSERTS -DUSE_RCPP
+PKG_CPPFLAGS = -I../inst/include -DEIGEN_PERMANENTLY_DISABLE_STUPID_WARNINGS -DBOOST_ENABLE_ASSERT_HANDLER -DUSE_RCPP
 PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS)
 
 ## With Rcpp 0.11.0 and later, we no longer need to set PKG_LIBS as there is