Pagination HotFix