Correcting order of messages to from server