Fix Path finder...