Fixed Bad Navigate