FIX ecomfe/edp#259