Fix Driver navigation @mlecoeuvre