Fix crash
Fix crash