Pushed a quick fix. I tried it myself and was able to reproduce the issue earlier. 
Please update and let me know.
In the meantime, I will do another dive into chat code and core to see if TC can be simplified!
4 Likes