CurrentPath fix