diff --git a/servers/slapd/back-ldap/compare.c b/servers/slapd/back-ldap/compare.c
index 9ab66e0cb3..d8767c6f91 100644
--- a/servers/slapd/back-ldap/compare.c
+++ b/servers/slapd/back-ldap/compare.c
@@ -100,8 +100,7 @@ ldap_back_compare(
 	}
 #endif /* !ENABLE_REWRITE */
 
-	if ( ava->aa_desc->ad_type->sat_oid 
-			== slap_schema.si_ad_objectClass->ad_type->sat_oid ) {
+	if ( ava->aa_desc == slap_schema.si_ad_objectClass ) {
 		ldap_back_map(&li->oc_map, &ava->aa_desc->ad_cname, &mapped_oc,
 				BACKLDAP_MAP);
 		if (mapped_oc.bv_val == NULL || mapped_oc.bv_val[0] == '\0') {
diff --git a/servers/slapd/back-meta/compare.c b/servers/slapd/back-meta/compare.c
index 9c6d803783..815e515cad 100644
--- a/servers/slapd/back-meta/compare.c
+++ b/servers/slapd/back-meta/compare.c
@@ -153,8 +153,7 @@ meta_back_compare(
 		/*
 		 * if attr is objectClass, try to remap the value
 		 */
-		if ( ava->aa_desc->ad_type->sat_oid 
-			== slap_schema.si_ad_objectClass->ad_type->sat_oid ) {
+		if ( ava->aa_desc == slap_schema.si_ad_objectClass ) {
 			ldap_back_map( &li->targets[ i ]->oc_map,
 					&ava->aa_value, &mapped_value,
 					BACKLDAP_MAP );