Handle the path as well