finally fix the paths