Fix: navigation fails