Fix ecomfe/edp#142