Crash bug hotfix