Fix for Pagination