diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index 381646919b..5118d23d46 100644
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -1885,10 +1885,10 @@ caseExactIgnoreSubstringsFilter
 	}
 
 	if( nkeys == 0 ) {
+#ifndef SLAP_NVALUES
 		if ( sa->sa_final.bv_val ) free( sa->sa_final.bv_val );
 		if ( sa->sa_any ) ber_bvarray_free( sa->sa_any );
 		if ( sa->sa_initial.bv_val ) free( sa->sa_initial.bv_val );
-#ifndef SLAP_NVALUES
 		ch_free( sa );
 #endif
 		*keysp = NULL;
@@ -2002,10 +2002,11 @@ caseExactIgnoreSubstringsFilter
 		ch_free( keys );
 		*keysp = NULL;
 	}
+
+#ifndef SLAP_NVALUES
 	if ( sa->sa_final.bv_val ) free( sa->sa_final.bv_val );
 	if ( sa->sa_any ) ber_bvarray_free( sa->sa_any );
 	if ( sa->sa_initial.bv_val ) free( sa->sa_initial.bv_val );
-#ifndef SLAP_NVALUES
 	ch_free( sa );
 #endif
 
diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 9e747fa5a3..6816cf1325 100644
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -36,7 +36,7 @@
 #include "ldap_queue.h"
 
 #ifdef LDAP_DEVEL
-/* #define SLAP_NVALUES 1 */
+#define SLAP_NVALUES 1
 #define SLAP_EXTENDED_SCHEMA 1
 #endif