HardCode crash hotfix