fix issue with chat