UFL fix removing trailing path