Fix ecomfe/edp#160