Correct next page logic