Issue #398 - Fixing TOC... again