Crash bug solved