fixed for Chat sample