Chat fix

Chat fix