hotfix for chat issue.
Merge pull request #1541 from ririchiyo/chat_additions

hotfix for chat issue