Add navigator check