Chat bug resolved
Merged