Fix incorrect navigation issue.