Fixed next page behavior