message numbering fixed