diff --git a/servers/slapd/matchedValues.c b/servers/slapd/matchedValues.c
index 4f0dafbdb6..fa3f8597bd 100644
--- a/servers/slapd/matchedValues.c
+++ b/servers/slapd/matchedValues.c
@@ -235,7 +235,12 @@ test_ava_vrFilter(
 
 		}
 
-		for ( bv = a->a_vals, j=0; bv->bv_val != NULL; bv++, j++ ) {
+#ifdef SLAP_NVALUES
+		bv = a->a_nvals;
+#else
+		bv = a->a_vals;
+#endif
+		for ( j=0; bv->bv_val != NULL; bv++, j++ ) {
 			int ret;
 			int rc;
 			const char *text;
@@ -321,7 +326,12 @@ test_substrings_vrFilter(
 			continue;
 		}
 
-		for ( bv = a->a_vals, j = 0; bv->bv_val != NULL; bv++, j++ ) {
+#ifdef SLAP_NVALUES
+		bv = a->a_nvals;
+#else
+		bv = a->a_vals;
+#endif
+		for ( j = 0; bv->bv_val != NULL; bv++, j++ ) {
 			int ret;
 			int rc;
 			const char *text;