fixing row index bug on subsequent skips