diff --git a/src/fluid_solver.cpp b/src/fluid_solver.cpp
index b2082d30f266845d6e75bd30a8dc8195a656f53a..9c40092699b1f1667d2c919bfba74ce9d6414e74 100644
--- a/src/fluid_solver.cpp
+++ b/src/fluid_solver.cpp
@@ -421,7 +421,7 @@ FLUID_SOLVER_DEFINITIONS(
         float,
         fftwf_complex,
         MPI_FLOAT,
-        MPI_C_FLOAT_COMPLEX)
+        MPI_COMPLEX)
 //FLUID_SOLVER_DEFINITIONS(
 //        FFTW_MANGLE_DOUBLE,
 //        double,
diff --git a/src/fluid_solver_base.cpp b/src/fluid_solver_base.cpp
index 86d566ca893742f01e017ec8a642d67bd79ab1ee..7bcb9e8fb409d33ce8c2e765fa00d62b48885ade 100644
--- a/src/fluid_solver_base.cpp
+++ b/src/fluid_solver_base.cpp
@@ -20,7 +20,7 @@
 
 
 
-//#define NDEBUG
+#define NDEBUG
 
 #include <cassert>
 #include <cmath>
@@ -451,7 +451,7 @@ FLUID_SOLVER_BASE_DEFINITIONS(
         float,
         fftwf_complex,
         MPI_FLOAT,
-        MPI_C_FLOAT_COMPLEX)
+        MPI_COMPLEX)
 //FLUID_SOLVER_BASE_DEFINITIONS(
 //        FFTW_MANGLE_DOUBLE,
 //        double,