Another fix for DMP