another crash fix attempt