crash bug fix