FIX ecomfe/edp#281