diff --git a/servers/slapd/back-meta/map.c b/servers/slapd/back-meta/map.c
index 962b4f05e51d3fa58e47891f8ae9e485cd208625..45e1358e0a39953935c8e9ec06e503d21e6953ae 100644
--- a/servers/slapd/back-meta/map.c
+++ b/servers/slapd/back-meta/map.c
@@ -323,7 +323,7 @@ ldap_back_int_filter_map_rewrite(
 		return LDAP_OTHER;
 	}
 
-	switch ( f->f_choice ) {
+	switch ( ( f->f_choice & SLAPD_FILTER_MASK ) ) {
 	case LDAP_FILTER_EQUALITY:
 		if ( map_attr_value( dc, f->f_av_desc, &atmp,
 					&f->f_av_value, &vtmp, remap ) )