Jon: Fixing page iteration issue.