Fix overflow in table and table-of-contents (#8608)

Fix overflow in table and table-of-contents (#8608) #7624