Fixed the chat messages