another crash fix