yes, a proper fix would need a timer service. Let's do what we can for now.