Fix ecomfe/edp#129