fixed ordering of messages mistake