potential crash bug fixed