[DF-841] Fixed