Added temp fix for DDC-2276