Fix random crashes
Fix random crashes