Further fixing chat