Fixed pagination issue when there is only one row #30