UF-119: adapted to UF's Path recent changes