Fix row numbering