bug fix : Memory Issue