Small fix

- stop using the id, use row number