Correct page logic

fixes #82