Fix for toc sometimes jumping to wrong section.

Change-Id: Ie0286319a2522341eeef3a6c49342ab35c784a2a