Fixing the godawful pager logic