FIX ecomfe/edp#312