Hotfix for navigation fix.