Fixed the Chat