FIX ecomfe/edp#261