Fixed navigation issue