fix ordering of chat and client