diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c
index efffa48388..8678f48b64 100644
--- a/servers/slapd/filter.c
+++ b/servers/slapd/filter.c
@@ -331,7 +331,7 @@ get_filter(
 		break;
 
 	default:
-		(void) ber_skip_tag( ber, &len );
+		(void) ber_scanf( ber, "x" ); /* skip the element */
 #ifdef NEW_LOGGING
 		LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
 			   "get_filter: conn %d unknown filter type=%lu\n",
diff --git a/tests/scripts/test003-search b/tests/scripts/test003-search
index 38a90e5db1..68cd8fd107 100755
--- a/tests/scripts/test003-search
+++ b/tests/scripts/test003-search
@@ -69,7 +69,7 @@ fi
 
 echo "Testing OR searching..."
 $LDAPSEARCH -S "" -b "$BASEDN" -h localhost -p $PORT \
-	'(|(objectclass=groupofnames)(sn=jones))' >> $SEARCHOUT 2>&1
+	'(|(undefined=fubar)(objectclass=groupofnames)(sn=jones))' >> $SEARCHOUT 2>&1
 if test $RC != 0 ; then
 	echo "ldapsearch failed ($RC)!"
 	kill -HUP $PID