Fix order of messages