Proper fix for crash.