yet another crash fix