Fixed chat issue