Libs/Chat: Emergency fix