crash bug fixed