fixing order of messages