Fix SPOUT-241
Merge pull request #2194 from Snaipe/chatfix

Fix SPOUT-241