adapt to new eliomdep