Fix for DDC-2359