navigationstack fix