Fixed the navigation issue on XE 16