Key page navigation out of bounds bug fix