Fixed building EDS 3.4