Just to be clear, your first sentence describes ToC working correctly. Is it ToC or ToD that’s not working for you?