Adding fix for DDP 1