One of the last chat bugfix