Navigation target hotfix