Imran | BSHR-102 | bug fix