Fix chat issue caused by fix for other chat issue!