Fixed automated message order