BS-7828: defect