Fix for crashgroup 23fbb42