Work around for now of new chat system