Fixed the groupchat bug in a smarter way.