Crash bug fixed