Temporary Fix for Chatting