[TW132] - Some hacks to toc5