Reaarange to possibly fix crash