Hotfix (crash bug)