Better path

Change-Id: I601d681ca86a5786d2115634538f9805475e3128