Fixing pager issue