fixed horrible timer issue