Possible chat fix