handle paths better