Solves issue #8 related to nav errors and simplifies logic