Fix pager issue