Potential (Untested) fix for Chat