fixed the order for messages