Fix for crashgroup b77ffba