fix timer issue