merge toc edit bug fix from KevinH.