fixed timer issue