Fixes #139, now it navigates correctly