bug fix
another crash fix