EBA DPM workarounds