Fix Iteration

Fixed iteration only returning 199 rows due to fixes in how the counter
was handled from issue #3