Improved how row numbers are transferred.