imran|0000| bug fix