We keep finding strange crashes in unexpected places. This should fix the latest of them.