diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index 46d1c6d718..08e733fed4 100644
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -1826,7 +1826,7 @@ UTF8StringValidate(
 		if( LDAP_UTF8_OFFSET( (char *)u ) != len ) return LDAP_INVALID_SYNTAX;
 	}
 
-	if( u >= len ) {
+	if( u > end ) {
 		return LDAP_INVALID_SYNTAX;
 	}