diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index 1c7be72610..47b2852e76 100644
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -278,12 +278,9 @@ fail:
 		if ( SLAP_GLUE_SUBORDINATE( be ) && !SLAP_GLUE_ADVERTISE( be ) ) {
 			continue;
 		}
-		for ( j = 0; be->be_suffix[j].bv_val != NULL; j++ ) {
-			if( attr_merge_one( e, ad_namingContexts,
-					&be->be_suffix[j], NULL ) )
-			{
-				goto fail;
-			}
+		if ( attr_merge( e, ad_namingContexts,
+				be->be_suffix, be->be_nsuffix ) ) {
+			goto fail;
 		}
 	}