Fixed a timer issue