adapted to last changes in UF