Fixed navigation loops