other changes to mitigate crash