One last chat fix