Possible fix for chat  bug