Fix next page problem