diff --git a/libraries/libldap/search.c b/libraries/libldap/search.c
index 808fb81819..56b07a7df2 100644
--- a/libraries/libldap/search.c
+++ b/libraries/libldap/search.c
@@ -458,7 +458,9 @@ filter_value_unescape( char *fval )
 				/* escape at end of string */
 				return -1;
 
-			} else if (( v1 = hex2value( fval[v] )) < 0 )  {
+			}
+
+			if (( v1 = hex2value( fval[v] )) >= 0 ) {
 				/* LDAPv3 escape */
 
 				if (( v2 = hex2value( fval[v+1] )) < 0 ) {