Fixed issue DDC-2645