fix for DDC-2599