adapted to UF 0.4.x (master)