Optionally allow to only yield a single event
Fix startup behaviour