Fix ecomfe/edp#144