- another crash fix attempt.