Fix bug where change of page would start one page too far