Fix PATH order