Fixed the way the chat is populated