crash bug fixed
crash bug fixed