Aw Heck, WAR!: PATCH

Fixed a problem where the navigation logic started a infinite loop error