Tock issue: infinite loop
Merge pull request #1185 from najor/dev-toc-issue

Tock issue: infinite loop