please add TODO to investigate whether this is really necessary (why can't we just rely on events?)