diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index c3b9eb14d6..5fd5d7f428 100644
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -888,9 +888,9 @@ acl_mask(
 			 * rights are determined by OR'ing the individual
 			 * rights given by the acis.
 			 */
-			for ( i = 0; at->a_vals[i] != NULL; i++ ) {
+			for ( i = 0; at->a_vals[i].bv_val != NULL; i++ ) {
 				if (aci_mask( be, conn, op,
-					e, desc, val, at->a_vals[i],
+					e, desc, val, &at->a_vals[i],
 					matches, &grant, &deny ) != 0)
 				{
 					tgrant |= grant;