Fix to infinite looping navigation?