Ticket # 856: fixing toc too short (or too long) issue.

Signed-off-by: Sonia <sonia@nudge.ca>