Fixed the navigation issue on XE 16
Merge pull request #20 from xjefftang/master

Fixed the navigation issue on XE 16