FIXED DEM ISSUES