Mike's chat fix