Fixed navigation dependency bug