Fixed #155 through minor refactoring of heading/navigation code