Last pager fix (fingers crossed)