Crash hotfix