Fixing Issue #332 TOC