Chat Logic Fixed