We should keep an eye on performance if this is triggered all the time, possibly synchronously...