Bug Fix with Pagination