- Fix crash bug