Fixed timer issue