Close 13 . Edge case on pagination fixed