diff --git a/src/rvoice/fluid_chorus.h b/src/rvoice/fluid_chorus.h
index 1a211c57..c446f909 100644
--- a/src/rvoice/fluid_chorus.h
+++ b/src/rvoice/fluid_chorus.h
@@ -35,11 +35,15 @@ typedef enum
   FLUID_CHORUS_SET_SPEED = 1 << 2,
   FLUID_CHORUS_SET_DEPTH = 1 << 3,
   FLUID_CHORUS_SET_TYPE  = 1 << 4,
+  
+  /** Value for fluid_chorus_set() which sets all chorus parameters. */
+  FLUID_CHORUS_SET_ALL   =   FLUID_CHORUS_SET_NR
+                           | FLUID_CHORUS_SET_LEVEL
+                           | FLUID_CHORUS_SET_SPEED
+                           | FLUID_CHORUS_SET_DEPTH
+                           | FLUID_CHORUS_SET_TYPE,
 } fluid_chorus_set_t;
 
-/** Value for fluid_chorus_set() which sets all chorus parameters. */
-#define FLUID_CHORUS_SET_ALL    0x1F
-
 /*
  * chorus
  */
diff --git a/src/rvoice/fluid_rev.h b/src/rvoice/fluid_rev.h
index 54945a1a..009f39e7 100644
--- a/src/rvoice/fluid_rev.h
+++ b/src/rvoice/fluid_rev.h
@@ -33,12 +33,15 @@ typedef enum
   FLUID_REVMODEL_SET_ROOMSIZE       = 1 << 0,
   FLUID_REVMODEL_SET_DAMPING        = 1 << 1,
   FLUID_REVMODEL_SET_WIDTH          = 1 << 2,
-  FLUID_REVMODEL_SET_LEVEL          = 1 << 3
+  FLUID_REVMODEL_SET_LEVEL          = 1 << 3,
+  
+  /** Value for fluid_revmodel_set() which sets all reverb parameters. */
+  FLUID_REVMODEL_SET_ALL            =   FLUID_REVMODEL_SET_LEVEL
+                                      | FLUID_REVMODEL_SET_WIDTH
+                                      | FLUID_REVMODEL_SET_DAMPING
+                                      | FLUID_REVMODEL_SET_ROOMSIZE,
 } fluid_revmodel_set_t;
 
-/** Value for fluid_revmodel_set() which sets all reverb parameters. */
-#define FLUID_REVMODEL_SET_ALL      0x0F
-
 /*
  * reverb preset
  */