Fixed out of range nav selection