There is also a problem in draft 6 with index page numbers > 30 being off by one. We need to make sure this goes away.