another crash fix :(