Fix ecomfe/edp#228