fixed ordering of messages