diff --git a/src/utils/fluid_settings.c b/src/utils/fluid_settings.c
index 5d315533..0d0f17d2 100644
--- a/src/utils/fluid_settings.c
+++ b/src/utils/fluid_settings.c
@@ -116,7 +116,7 @@ delete_fluid_str_setting(fluid_setting_node_t* node)
 {
   fluid_return_if_fail(node != NULL);
   
-  FLUID_ASSERT(node->type, FLUID_STR_TYPE);
+  FLUID_ASSERT(node->type == FLUID_STR_TYPE);
 
   FLUID_FREE(node->str.value);
   FLUID_FREE(node->str.def);
@@ -169,7 +169,7 @@ delete_fluid_num_setting(fluid_setting_node_t* node)
 {
   fluid_return_if_fail(node != NULL);
   
-  FLUID_ASSERT (node->type, FLUID_NUM_TYPE);
+  FLUID_ASSERT (node->type == FLUID_NUM_TYPE);
   FLUID_FREE(node);
 }
 
@@ -205,7 +205,7 @@ delete_fluid_int_setting(fluid_setting_node_t* node)
 {
     fluid_return_if_fail(node != NULL);
   
-  FLUID_ASSERT (node->type, FLUID_INT_TYPE);
+  FLUID_ASSERT (node->type == FLUID_INT_TYPE);
   FLUID_FREE(node);
 }
 
@@ -243,7 +243,7 @@ delete_fluid_set_setting(fluid_setting_node_t* node)
 {
     fluid_return_if_fail(node != NULL);
     
-    FLUID_ASSERT (node->type, FLUID_SET_TYPE);
+    FLUID_ASSERT (node->type == FLUID_SET_TYPE);
     delete_fluid_hashtable(node->set.hashtable);
     FLUID_FREE(node);
 }
diff --git a/src/utils/fluidsynth_priv.h b/src/utils/fluidsynth_priv.h
index 1fbf0896..7addb1f8 100644
--- a/src/utils/fluidsynth_priv.h
+++ b/src/utils/fluidsynth_priv.h
@@ -335,8 +335,11 @@ do { strncpy(_dst,_src,_n); \
 #define M_LN10 2.3025850929940456840179914546844
 #endif
 
-#define FLUID_ASSERT(a,b)
-#define FLUID_ASSERT_P(a,b)
+#ifdef NDEBUG
+#define FLUID_ASSERT(a) 
+#else
+#define FLUID_ASSERT(a) g_assert(a)
+#endif
 
 #define FLUID_LIKELY G_LIKELY
 #define FLUID_UNLIKELY G_UNLIKELY