bug fix : speed up