bug fix/preformance issue fix