Another try to fix first pager