Fix ecomfe/edp#240