Imran | BSHR-102 | temporary bug fix