Fixed problem CHAT part II