fixed chat issue