Corrected next row loading