Fixed navigation behavior