added .navigation check