timer issue fix