Try to fix chat bug#13

dguostanford wants to merge 2 commits into

mainbasketbla/377U:mainfrom

chat-bugbasketbla/377U:chat-bugCopy head branch name to clipboard