#DEM-4 fixed