diff --git a/servers/slapd/extended.c b/servers/slapd/extended.c
index 1660aaa914..3778c45a3c 100644
--- a/servers/slapd/extended.c
+++ b/servers/slapd/extended.c
@@ -243,4 +243,5 @@ find_extop( extop_list_t *list, char *oid )
 			return(ext);
 	}
 	return(NULL);
-}
\ No newline at end of file
+}
+
diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index f08bc5ec39..3e874d532b 100644
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -3216,8 +3216,8 @@ numericStringNormalize(
 		}
 	}
 
-	assert( newval->bv_val <= p );
-	assert( q <= p );
+	/* we should have copied no more then is in val */
+	assert( (q - newval->bv_val) <= (p - val->bv_val) );
 
 	/* null terminate */
 	*q = '\0';