Maybe we can teach scrutinizer to take care of this?

But I guess this is good for now :+1: