Fixed issue in client, messages being echoed correctly