Fixed TOC problems